merge of '61b65ffb0a858399f89407df40b6469b203bda44'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 6 May 2007 15:33:37 +0000 (15:33 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sun, 6 May 2007 15:33:37 +0000 (15:33 +0000)
     and 'ed3f0331cfddd29d423591aa25379dc841a37572'


Trivial merge