From: Bdale Garbee <bdale@gag.com>
Date: Mon, 15 Mar 2010 22:07:54 +0000 (-0600)
Subject: Merge commit 'upstream/2.12'
X-Git-Tag: debian/2.12-1~1
X-Git-Url: https://git.gag.com/?p=debian%2Fcpmtools;a=commitdiff_plain;h=ae6afc9c938629be449e04c2bb1813ea63941307

Merge commit 'upstream/2.12'
---

ae6afc9c938629be449e04c2bb1813ea63941307