Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Tue, 4 Oct 2011 06:40:12 +0000 (08:40 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Tue, 4 Oct 2011 06:40:12 +0000 (08:40 +0200)

Trivial merge