merge of '105955293719b2a1414f1b03af410b8ff8dbdb1b'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:54:19 +0000 (10:54 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 10:54:19 +0000 (10:54 +0000)
     and 'bbfafd074ae90979163ac23aa8963973c27e811d'


Trivial merge