Merge commit 'upstream/3.12'
authorBdale Garbee <bdale@gag.com>
Mon, 2 Nov 2009 03:23:39 +0000 (20:23 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 2 Nov 2009 03:23:39 +0000 (20:23 -0700)

Trivial merge