Checkout
light5
committed
on 18 Jan 12
Sync up from trunk (merge merge -r 1787:1831 from trunk to this branch.)