Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 18 May 2011 15:56:23 +0000 (17:56 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 18 May 2011 15:56:23 +0000 (17:56 +0200)

Trivial merge