merge of 'b67fa447ea540c7174493e27cff5886f3f4ee90d'
authorJeremy Laine <jeremy.laine@m4x.org>
Sat, 1 Dec 2007 12:28:00 +0000 (12:28 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Sat, 1 Dec 2007 12:28:00 +0000 (12:28 +0000)
     and 'f22535c96dd5d39ae39d98a069d0f7fa5ebb4ace'


Trivial merge