Merge remote-tracking branch 'origin/stable-2.0'
authorMark H Weaver <mhw@netris.org>
Sat, 10 Nov 2012 04:09:38 +0000 (23:09 -0500)
committerMark H Weaver <mhw@netris.org>
Sat, 10 Nov 2012 04:09:38 +0000 (23:09 -0500)

Trivial merge