From: Bdale Garbee <bdale@gag.com>
Date: Sat, 18 Apr 2009 18:05:40 +0000 (-0600)
Subject: Merge commit 'upstream/2.6.1p1'
X-Git-Tag: debian/2.6.1p1-1~20
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;ds=sidebyside;h=3469241adf5f8b45020b0896ee13d17c4c7a2abf;p=debian%2Famanda

Merge commit 'upstream/2.6.1p1'
---

3469241adf5f8b45020b0896ee13d17c4c7a2abf