Merge remote branch 'tove/master'
authorJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:11:51 +0000 (15:11 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Sat, 2 Jan 2010 20:11:51 +0000 (15:11 -0500)
commit9747c47670064f206189eb3c36a8e7fcfe08e172
treeb03e6b788a91738a2b87ada00c0d7f8ae0ec67f0
parent1d9a41eecbf7029698aa11b680919864707583ed
parent59277c9b6b6461d7097db12b1ed06c1a6a58ec17
Merge remote branch 'tove/master'