Merge branch 'master' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 21 Jan 2012 12:01:20 +0000 (13:01 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 21 Jan 2012 12:01:20 +0000 (13:01 +0100)

Trivial merge