Merge branch 'master' into cbrutail/map-lightspeed
authorcbrutail <ruszkai.akos@gmail.com>
Sat, 18 Jun 2011 22:05:21 +0000 (00:05 +0200)
committercbrutail <ruszkai.akos@gmail.com>
Sat, 18 Jun 2011 22:05:21 +0000 (00:05 +0200)

Trivial merge