From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 23 Sep 2008 19:58:29 +0000 (-0700)
Subject: merge from mainline
X-Git-Tag: release/2.6.0~469^2~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c3425c0e6e50addb697c812e99130c9b06fdaf73;p=debbugs.git

merge from mainline
---

c3425c0e6e50addb697c812e99130c9b06fdaf73