merge of '0e9b0714e6ab764eaa6afb85fbd5d15b41175604'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 27 Aug 2008 16:22:56 +0000 (16:22 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 27 Aug 2008 16:22:56 +0000 (16:22 +0000)
     and '45a9c4a970e79c5b8343a4a4ff110589bcc19d2f'


Trivial merge