Merge remote-tracking branch 'origin/savagex/common'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:47:31 +0000 (14:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:47:31 +0000 (14:47 +0200)

Trivial merge