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)
     and 'ddac71d079db394f27c2b51f7967ea038d63a347'


Trivial merge