Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Fri, 28 Oct 2011 06:04:46 +0000 (08:04 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Fri, 28 Oct 2011 06:04:46 +0000 (08:04 +0200)

Trivial merge