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

Trivial merge