merge of '1c40da9a692a6c3985b5d6fe8eb5b28dd7738c66'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 29 Feb 2008 17:05:05 +0000 (17:05 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 29 Feb 2008 17:05:05 +0000 (17:05 +0000)
     and '295199ba5efc8ddca9453992b8304f356f385efd'


Trivial merge