Merge remote branch 'upstream/master'
authorscottjehl <scott@scottjehl.com>
Wed, 19 Jan 2011 17:32:57 +0000 (12:32 -0500)
committerscottjehl <scott@scottjehl.com>
Wed, 19 Jan 2011 17:32:57 +0000 (12:32 -0500)

Trivial merge