Merge branch 'master' into cbrutail/map-lightspeed_domereplace
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 10 Feb 2012 22:11:29 +0000 (23:11 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 10 Feb 2012 22:11:29 +0000 (23:11 +0100)

Trivial merge