merge of '3eeaba619f8cf3f53f5f2e5f2a4e8a0ede51ef98'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 18 May 2007 20:57:52 +0000 (20:57 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Fri, 18 May 2007 20:57:52 +0000 (20:57 +0000)
     and 'bdb1d5497bcbe5ed979da5355c5947d6bca81539'


Trivial merge