merge of '7d6ea0e6dab43d210ce6c89ab32e84f6264a0e4e'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 28 Apr 2007 22:53:11 +0000 (22:53 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Sat, 28 Apr 2007 22:53:11 +0000 (22:53 +0000)
     and 'aa7099bcaa69d3aacb75bcf28c52e9a7d5638580'


Trivial merge