merge of '6f9abba2c67b22b08b6642422263d870e580295d'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 24 May 2007 09:07:54 +0000 (09:07 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 24 May 2007 09:07:54 +0000 (09:07 +0000)
     and '7c39b426fc32598ba1b6e18212bbc6a7cf2c8f9e'


Trivial merge