merge of '065abdf242661efc1f87ef660245679039448d20'
authorJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:01:19 +0000 (11:01 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Fri, 7 Dec 2007 11:01:19 +0000 (11:01 +0000)
     and 'e94fdfc4cfd1145195d512ee0bbf48e1ecaa41be'


Trivial merge