Merge branch 'master' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 18:34:28 +0000 (19:34 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 4 Jan 2012 18:34:28 +0000 (19:34 +0100)

Trivial merge