merge with trunk up to Rev: 10954 Date: 2010-06-09 13:47:21
Authored by: stivosaurus 2010-06-10
Parent: [r56]
Child: [r58]