Merge branch 'master' into next
authorBdale Garbee <bdale@gag.com>
Sun, 20 Jan 2013 20:57:57 +0000 (13:57 -0700)
committerBdale Garbee <bdale@gag.com>
Sun, 20 Jan 2013 20:57:57 +0000 (13:57 -0700)

Trivial merge