Merge commit 'upstream/4.6.1'
authorBdale Garbee <bdale@gag.com>
Mon, 26 Dec 2011 07:08:39 +0000 (00:08 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 26 Dec 2011 07:08:39 +0000 (00:08 -0700)

Trivial merge