merge of 'ce64d96dcf3b268df1bdcd7e945e7188d09c7db8'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 28 Nov 2007 12:14:40 +0000 (12:14 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 28 Nov 2007 12:14:40 +0000 (12:14 +0000)
     and 'd521cbe6aca8b81bda5eb51149cea06dd31e1dd2'


Trivial merge