Checkout
buschmi
committed
on 22 Feb 11
Merging r1062944 through r1073113 into realtime branch