Merge commit 'origin/master' into diabolik/nexmodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Tue, 15 Jun 2010 19:04:36 +0000 (15:04 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Tue, 15 Jun 2010 19:04:36 +0000 (15:04 -0400)

Trivial merge