merge of '576d7c6e5dbff47f56003806561fdc43a07c6f50'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:00:18 +0000 (10:00 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:00:18 +0000 (10:00 +0000)
     and 'f564197dcff7dea800a0dcabf27c4809e2521c8c'


Trivial merge