merge of '95cefda8965d9f34e429a5b0e01d5c392825e133'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Apr 2008 12:28:01 +0000 (12:28 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Apr 2008 12:28:01 +0000 (12:28 +0000)
     and 'c8c6f8c33c61af0056076c21f8e84da83a85d8d8'


Trivial merge