From: Don Armstrong <don@donarmstrong.com>
Date: Sun, 30 Mar 2008 02:28:45 +0000 (-0700)
Subject: merge changes from mainline
X-Git-Tag: release/2.6.0~492^2~3
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0422fb900fb4fc682b8558ca7fd1e5ae634d7407;p=debbugs.git

merge changes from mainline
---

0422fb900fb4fc682b8558ca7fd1e5ae634d7407