merge of '19bacabe62a70bf0818d663c4cd3bc168e5cf49e'
authorJeremy Laine <jeremy.laine@m4x.org>
Thu, 29 Nov 2007 19:09:40 +0000 (19:09 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Thu, 29 Nov 2007 19:09:40 +0000 (19:09 +0000)
     and '805d2f01c6463550c4d0dd1f943fc6f32ae13613'


Trivial merge