merge of '5c57f792fa4408bfd1d31632734168b1434d7100'
authorJeremy Laine <jeremy.laine@m4x.org>
Tue, 6 May 2008 00:41:48 +0000 (00:41 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Tue, 6 May 2008 00:41:48 +0000 (00:41 +0000)
     and 'de01edf0c06eb0cc6e3c6b19195f32bc67519b19'


Trivial merge