merge of 'bec88f8c787bf716caa2fed4d5076d31a98bba16'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 1 Feb 2008 10:35:39 +0000 (10:35 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 1 Feb 2008 10:35:39 +0000 (10:35 +0000)
     and 'f6b3170bc0db632a8c4bac63cc6de9b5655a653d'


Trivial merge