Merge branch 'passive'
authorBdale Garbee <bdale@gag.com>
Sun, 6 Oct 2013 05:57:55 +0000 (23:57 -0600)
committerBdale Garbee <bdale@gag.com>
Sun, 6 Oct 2013 05:57:55 +0000 (23:57 -0600)

Trivial merge