Merge branch 'release'
authorClinton Ebadi <clinton@unknownlamer.org>
Tue, 8 Mar 2011 16:35:23 +0000 (11:35 -0500)
committerClinton Ebadi <clinton@unknownlamer.org>
Tue, 8 Mar 2011 16:35:23 +0000 (11:35 -0500)

Trivial merge