merge of '6c0f3ae545f03846a2a1df3e227d38a0ec34f366'
authorJeremy Laine <jeremy.laine@m4x.org>
Thu, 14 Feb 2008 10:42:04 +0000 (10:42 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Thu, 14 Feb 2008 10:42:04 +0000 (10:42 +0000)
     and 'd12fb4026285bb4fc80a8dae8cd3e9cde6a0f72a'


Trivial merge