merge of '2a251a71a9f271e9e3c90442f4664989c4200546'
authorPhil Blundell <philb@gnu.org>
Mon, 14 Aug 2006 16:07:24 +0000 (16:07 +0000)
committerPhil Blundell <philb@gnu.org>
Mon, 14 Aug 2006 16:07:24 +0000 (16:07 +0000)
commit3830a846a0b2cf5eea843897149fe8f0811d34f2
tree49019cda8c97498a6d6b47a9c73ace5d27335e63
parenta0bd2cb2f525fab73a4e87250c993250ad3a38b8
parent309c843513b2b3fcc6477e5bffced34680480486
Merge ... '2a251a71a9f271e9e3c90442f4664989c4200546'
     and 'be32f635579fe38afb045ac1745953ca97f2f55a'