merge of '23d887e2d2e50dec327486756c223c4dbbd10f70'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:24:32 +0000 (11:24 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:24:32 +0000 (11:24 +0000)
     and 'f9718212cc877376dcd4cf9ffaf6991c4522d628'


Trivial merge