merge of '6fedd04121b05719430c13ec266e45683ed3b7bf'
authorJeremy Laine <jeremy.laine@m4x.org>
Sun, 13 Apr 2008 09:08:49 +0000 (09:08 +0000)
committerJeremy Laine <jeremy.laine@m4x.org>
Sun, 13 Apr 2008 09:08:49 +0000 (09:08 +0000)
     and 'cebd7c2df88a5188ea19393bb7e04a6d3c592956'


Trivial merge