Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 14:33:32 +0000 (15:33 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 14:33:32 +0000 (15:33 +0100)

Trivial merge