merge of '64d61b910321c9ea962004a87927c15c3ba97cc3'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 18 Jan 2007 22:29:39 +0000 (22:29 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 18 Jan 2007 22:29:39 +0000 (22:29 +0000)
     and '9ba44743e0bc03478bbf0e119e8639d484aca41e'


Trivial merge