Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Fri, 9 Nov 2012 02:57:33 +0000 (21:57 -0500)
committerMark H Weaver <mhw@netris.org>
Fri, 9 Nov 2012 02:57:33 +0000 (21:57 -0500)

Trivial merge