Checkout
buschmi
committed
on 13 Jan 11
Merge r1054504 through r1058716 into realtime branch