Merge branch 'fruitiex/xpm' into fruitiex/ctsfix
authorFruitieX <fruitiex@gmail.com>
Sun, 12 Dec 2010 10:57:56 +0000 (12:57 +0200)
committerFruitieX <fruitiex@gmail.com>
Sun, 12 Dec 2010 10:57:56 +0000 (12:57 +0200)

Trivial merge