merge of '20415869e4deffc3f561d06a10ea4e95d8d13db7'
authorJeremy Laine <jeremy.laine@m4x.org>
Tue, 4 Dec 2007 11:26:50 +0000 (11:26 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Tue, 4 Dec 2007 11:26:50 +0000 (11:26 +0000)
     and 'bee606bba2fcf2659a8e2c29fbbc9d904f84962c'


Trivial merge