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)
     and '105955293719b2a1414f1b03af410b8ff8dbdb1b'


Trivial merge