merge of '978bc47ab709a72ea6a5bb83be03de70413bde5b'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 18 May 2007 21:06:49 +0000 (21:06 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 18 May 2007 21:06:49 +0000 (21:06 +0000)
     and '9901b7d8ab45644ffc32d64f4f47e4133d817534'


Trivial merge