Merge commit 'origin/fruitiex/newpanelhud' into diabolik/newpanelhud
authorSahil Singhal <sahil@sahil-desktop.(none)>
Fri, 11 Jun 2010 21:08:37 +0000 (17:08 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Fri, 11 Jun 2010 21:08:37 +0000 (17:08 -0400)

Trivial merge