Merge commit '961fd2402928e52177ae5f9d6bc8a6d097ec918f'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 19 Jan 2011 06:43:22 +0000 (07:43 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 19 Jan 2011 06:43:22 +0000 (07:43 +0100)

Trivial merge