Merge remote branch 'origin/master'
authorChris Zankel <czankel@speedy.(none)>
Tue, 3 Aug 2010 07:38:00 +0000 (00:38 -0700)
committerChris Zankel <czankel@speedy.(none)>
Tue, 3 Aug 2010 07:38:00 +0000 (00:38 -0700)

Trivial merge