merge of '665b801ef26b2b5da6423ad9a47eac8ab53b6574'
authorJeremy Laine <jeremy.laine@m4x.org>
Tue, 6 May 2008 00:40:51 +0000 (00:40 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Tue, 6 May 2008 00:40:51 +0000 (00:40 +0000)
     and 'a26f0aa5e87dfafafddf0175fac360e6ab7b2174'


Trivial merge