From: Debian BTS <debbugs@busoni>
Date: Fri, 23 Mar 2012 02:37:42 +0000 (+0000)
Subject: merge changes from dla source branch
X-Git-Tag: release/2.6.0~404
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=refs%2Fheads%2Fspacefun;p=debbugs.git

merge changes from dla source branch
---

86475657d997b61da7181f17a5d85a0c3f410be7