Merge branch 'next'
authorJoey Hess <joey@gnu.kitenet.net>
Wed, 31 Dec 2008 18:33:10 +0000 (13:33 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Wed, 31 Dec 2008 18:33:10 +0000 (13:33 -0500)
commitffec6806087981420eaf83c8d83cc4523a46d0de
treeea6c5462ab1ced6288492bdb01424488b76089ce
parent8c571160cf32be6e9c2698d1a02f95d7bdf073b1
parent3e8b7a6b196767d2c7d21790b6ed7c3fb5f70d31
Merge branch 'next'