Merge remote-tracking branch 'upstream/master'
authorrjorgenson <rjorgenson@gmail.com>
Sat, 12 Nov 2011 07:48:45 +0000 (00:48 -0700)
committerrjorgenson <rjorgenson@gmail.com>
Sat, 12 Nov 2011 07:48:45 +0000 (00:48 -0700)

Trivial merge