merge of '132be09ee353f798eadc984f8f09e27e68180850'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 2 Jan 2007 00:04:48 +0000 (00:04 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Tue, 2 Jan 2007 00:04:48 +0000 (00:04 +0000)
     and 'c0e1d74b2a331789caaf72b458b57924d21c7da3'


Trivial merge