Merge branch 'master' into fruitiex/mapinfo_improvements
authorFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 10:11:46 +0000 (12:11 +0200)
committerFruitieX <fruitiex@gmail.com>
Mon, 15 Nov 2010 10:11:46 +0000 (12:11 +0200)

Trivial merge