merge of '07638b4b82998b594ffb4858eaca86494159cda0'
authorJeremy Laine <jeremy.laine@m4x.org>
Mon, 12 May 2008 13:45:26 +0000 (13:45 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Mon, 12 May 2008 13:45:26 +0000 (13:45 +0000)
     and '1019be7986524fea8a63da6199f04430a64cd018'


Trivial merge