merge of '1f1207adefc2b440a93c771a15e7c5aab26497a4'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Apr 2008 12:15:56 +0000 (12:15 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Apr 2008 12:15:56 +0000 (12:15 +0000)
     and '5b1c73beb325cedc73f912683595bfe31eac6f31'


Trivial merge