Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Sun, 12 Jun 2011 18:15:56 +0000 (20:15 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Sun, 12 Jun 2011 18:15:56 +0000 (20:15 +0200)

Trivial merge