merge of '665b4cb1684c47ed44b254783ed9a928b4bfc1a0'
authorJeremy Laine <jeremy.laine@m4x.org>
Tue, 20 Nov 2007 08:18:15 +0000 (08:18 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Tue, 20 Nov 2007 08:18:15 +0000 (08:18 +0000)
     and '9e8440e09dae8ceed07468d5f6a230087ef8d736'


Trivial merge