merge of '4705c705c50943ca89b5319ffaaf2a5fce5b7a51'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:32:06 +0000 (11:32 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:32:06 +0000 (11:32 +0000)
     and 'cc9dbab30759699bd69f7da427983ce6fd2c1afa'


Trivial merge