merge of '3dca5f3aea64920432c630403debee9d79085513'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 23 May 2007 12:34:53 +0000 (12:34 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 23 May 2007 12:34:53 +0000 (12:34 +0000)
     and '7931018b514d370406604cd105b64fb5c00a9a6a'


Trivial merge