Merge commit '3f5af11a8794a82f13d066452580dd8d0cc756bc'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:13:12 +0000 (19:13 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:13:12 +0000 (19:13 +0200)

Trivial merge