merge of 'ab0df719db1a0db16a19dcb44ad9ac7df72730f4'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Jan 2008 14:29:41 +0000 (14:29 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 30 Jan 2008 14:29:41 +0000 (14:29 +0000)
     and 'f8e953325919c33c3f10d2427ace176d122f17b1'


Trivial merge