Merge remote branch 'athcx/maint' into maint
authorAndre Noll <maan@systemlinux.org>
Sun, 17 Jan 2010 20:32:11 +0000 (21:32 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 17 Jan 2010 20:32:11 +0000 (21:32 +0100)
commit4e84e9b35b8e45314d779ff6353e826ebda31483
treea32f498e9145ff72dbd6c9931a87b8128ecc2fdb
parent4ea3743c93e581954e9b1cf8ec7a10c38b35cfee
parent40af26f7f363ee8806874c470cd6338f4f934efa
Merge remote branch 'athcx/maint' into maint