merge of '2e9e31aaab7b3cb9ec8159571920f5085524e6c9'
authorJeremy Laine <jeremy.laine@m4x.org>
Mon, 5 May 2008 17:32:02 +0000 (17:32 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Mon, 5 May 2008 17:32:02 +0000 (17:32 +0000)
     and 'c4aee04fcf19f066a8cc1db58d3520728b043819'


Trivial merge