merge of '161f25ff852644b094fb04a166a56a41156e3f66'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 17 May 2007 17:01:35 +0000 (17:01 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Thu, 17 May 2007 17:01:35 +0000 (17:01 +0000)
     and '2f7cdf8eacd78e273744583cd918480d48f69dc8'


Trivial merge