Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Wed, 15 Jun 2011 17:21:54 +0000 (19:21 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Wed, 15 Jun 2011 17:21:54 +0000 (19:21 +0200)

Trivial merge