merge of '0d687ebf73328d86c69750e15499ae073b7b80f6'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:31:31 +0000 (10:31 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:31:31 +0000 (10:31 +0000)
commitf6f1c6eb5b792b0face12ad3b4d2e0bea0b65946
treebb8a392c28a25e2714a95c0e583d27d0e751f725
parent8beb70740dbd64d2138df8a07aafc24719cb50a6
parentc16ea23180e220831092ed326a3cfdf79517fd59
Merge ... '0d687ebf73328d86c69750e15499ae073b7b80f6'
     and '105955293719b2a1414f1b03af410b8ff8dbdb1b'