merge of '2baf3a1fbd62929bb0545e9e479b7a34b21190a2'
authorLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 9 May 2007 22:08:30 +0000 (22:08 +0000)
committerLeon Woestenberg <leon.woestenberg@gmail.com>
Wed, 9 May 2007 22:08:30 +0000 (22:08 +0000)
commit8805a80d179564eaaf4e3c40a10c7b4a63efcbee
treed8752f11021c264b563acf8ace63a1f98e5864fe
parentb621d23ceff0fe79d9ade6516c42d7fe7c2e815a
parent13e5f954fc508e978daca70db46af1d20ae1bcbc
Merge ... '2baf3a1fbd62929bb0545e9e479b7a34b21190a2'
     and '7ce8482617dacb21bddaed0ba9c8a445bbf9dfdf'