Merge commit '830125fad042fad35dc029b6eb57c8156ad7e176'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 27 Mar 2012 10:03:28 +0000 (12:03 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 27 Mar 2012 10:03:28 +0000 (12:03 +0200)

Trivial merge