merge of '09870e1a9a4da31b62af99557013fa62d824804b'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Apr 2008 11:00:03 +0000 (11:00 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Apr 2008 11:00:03 +0000 (11:00 +0000)
     and '4bd2ffe500d3e40adbb648e5d9f65484f4cca99b'


Trivial merge