Checkout
buschmi
committed
on 27 Jul 10
Merging trunk into realtime branch (r978810 through r979858)