Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Thu, 14 Jul 2011 08:55:04 +0000 (10:55 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Thu, 14 Jul 2011 08:55:04 +0000 (10:55 +0200)

Trivial merge