Merge remote-tracking branch 'origin/divVerent/weird-shift-a'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 14 Feb 2011 18:42:28 +0000 (19:42 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 14 Feb 2011 18:42:28 +0000 (19:42 +0100)

Trivial merge