merge of '65f2a2de9fd90693f2c33ba07aab5da699166173'
authorJeremy Laine <jeremy.laine@m4x.org>
Sat, 1 Dec 2007 12:28:14 +0000 (12:28 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Sat, 1 Dec 2007 12:28:14 +0000 (12:28 +0000)
     and 'd953a45d03a4cbcd74d92f973ca8c06fe3848355'


Trivial merge