merge of '7222928a192dd87d681067dcc74025c3a2ecf986'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 25 Aug 2007 17:00:30 +0000 (17:00 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 25 Aug 2007 17:00:30 +0000 (17:00 +0000)
     and 'c9235531d0eda1ab2165b6651685887b61d57ba1'


Trivial merge