Checkout
Daniel Gruno
committed
on 10 May 12
backport changes from trunk (r1336850) and rebuild