merge of '597edaa83bb7d8320a4ed098a2ba3430ce1878f0'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 23 May 2007 18:12:11 +0000 (18:12 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 23 May 2007 18:12:11 +0000 (18:12 +0000)
     and 'c40d025fb1caf193957c6e91f638354b6fcbf6bf'


Trivial merge