merge of '01ae5b27f3e0a00ab17a31f68cf002afac6cb807'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 12:26:52 +0000 (12:26 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 12:26:52 +0000 (12:26 +0000)
     and '0e4a2bbb7147a46977d9c8085b4fd469d11ab2a2'


Trivial merge