Merge commit 'smcv/atom'
authorJoey Hess <joey@gnu.kitenet.net>
Tue, 3 Feb 2009 20:04:36 +0000 (15:04 -0500)
committerJoey Hess <joey@gnu.kitenet.net>
Tue, 3 Feb 2009 20:04:36 +0000 (15:04 -0500)
commitb8b302cfa367f47d0c68d1f4e5fbf4f0b2aef25b
tree92ee48eedf27004c9acc0a582ba310df416c56ab
parentaba2d83cc6c0273c30ae109b32c2ea404488116e
parentdd862b4639bd470cbc3e726798af2f07587cb62e
Merge commit 'smcv/atom'