merge of '87aa8e8cdbee54b3d7ff294da220db58798e8c12'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 16 May 2008 16:24:50 +0000 (16:24 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 16 May 2008 16:24:50 +0000 (16:24 +0000)
     and 'a5324bd0638da4faba37d7b92ff362d19510c2fc'


Trivial merge