merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
authorJeremy Laine <jeremy.laine@m4x.org>
Tue, 4 Dec 2007 11:26:31 +0000 (11:26 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Tue, 4 Dec 2007 11:26:31 +0000 (11:26 +0000)
     and '8c692ec4078a7d2e345213289da925bfca3cac63'


Trivial merge