merge of '5e3a99cc75e7a19b9e1a2202770d36f7bb244ed3'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 28 May 2007 21:33:10 +0000 (21:33 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Mon, 28 May 2007 21:33:10 +0000 (21:33 +0000)
     and '964ce234ef1d5dd431f00bd022f11812fa77f370'


Trivial merge