Merge commit 'origin/master' into diabolik/weaponscale
authorSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 21:17:22 +0000 (17:17 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Sat, 15 May 2010 21:17:22 +0000 (17:17 -0400)

Trivial merge