trivial merge
commit48545b57560932ceb661306d8b961fc625415cf5
authorJim Meyering <jim@meyering.net>
Thu, 11 Jan 2007 13:49:19 +0000 (11 14:49 +0100)
committerJim Meyering <jim@meyering.net>
Thu, 11 Jan 2007 13:49:19 +0000 (11 14:49 +0100)
tree2e55c92d2e3166cd819ed104a48b94dfd22ca9f0
parentc8e51ae68abb0c9b281153ce64a83edd8bb7bdc8
parentdad7d86d57d2a6351ba1a395109760dce8977a91
trivial merge
ChangeLog