merge of '2683bd9d4ce3415de6e02aa18e8e6f4ee7fbfb5a'
authorJeremy Laine <jeremy.laine@m4x.org>
Sat, 1 Dec 2007 10:42:17 +0000 (10:42 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Sat, 1 Dec 2007 10:42:17 +0000 (10:42 +0000)
     and 'bee176e62f09ed2869211e26933a49bb485a2b2b'


Trivial merge