Merge remote branch 'remotes/origin/terencehill/newpanelhud' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Fri, 16 Jul 2010 00:30:25 +0000 (02:30 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Jul 2010 00:30:25 +0000 (02:30 +0200)

Trivial merge