merge of '305437fef3e07f06f422c525af6d258fe65bd133'
authorJeremy Laine <jeremy.laine@m4x.org>
Wed, 11 Jun 2008 16:18:53 +0000 (16:18 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Wed, 11 Jun 2008 16:18:53 +0000 (16:18 +0000)
     and '374794f574689cc1c361cad389b3b85f1ab2132d'


Trivial merge