Merge remote branch 'origin/terencehill/colorpicker_pos' into fruitiex/panelhud
authorFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 05:11:56 +0000 (07:11 +0200)
committerFruitieX <fruitiex@gmail.com>
Fri, 12 Nov 2010 05:11:56 +0000 (07:11 +0200)

Trivial merge