Merge commit '9805d7cf0ce8875950b667e16982fcecd02068ad'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:15:00 +0000 (19:15 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 17:15:00 +0000 (19:15 +0200)

Trivial merge