Merge branch 'keyword-rewrite' into keyword-rewrite-magic
Lukas Mai [Tue, 19 Jun 2012 03:48:52 +0000 (05:48 +0200)]

Trivial merge