merge of 'c897b9aae765097d608e7db4e7cd208c40f9ee74'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:24:03 +0000 (11:24 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:24:03 +0000 (11:24 +0000)
commitf0771afd9627211db59fcde15084512e5fcd1b22
tree9cfad3cfdbbafca55dacf5736aff6bffc2f56080
parentf6f1c6eb5b792b0face12ad3b4d2e0bea0b65946
parent5a563442195a2bdc36911cb173890dbd209895aa
Merge ... 'c897b9aae765097d608e7db4e7cd208c40f9ee74'
     and 'ddac71d079db394f27c2b51f7967ea038d63a347'