merge of '68843ccbc1303f0acf6b974257c646058b1a731a'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 8 Feb 2008 09:10:22 +0000 (09:10 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 8 Feb 2008 09:10:22 +0000 (09:10 +0000)
     and '7255c9706337fa8c7170d867233d05ae2dd0c459'


Trivial merge