Merge branch 'cbrutail/g-23_cant_take_it_anymore'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 30 Dec 2011 19:10:54 +0000 (20:10 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 30 Dec 2011 19:10:54 +0000 (20:10 +0100)

Trivial merge