Checkout
Karl Fogel
committed
on 22 Jan 08
Merge 'reintegrate' branch to trunk.