Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Tue, 16 Jul 2013 05:48:19 +0000 (01:48 -0400)
committerMark H Weaver <mhw@netris.org>
Tue, 16 Jul 2013 05:48:19 +0000 (01:48 -0400)

Trivial merge