+ merged trunk to update svn before merging back into trunk
Authored by: bworrell 2012-01-17
Parent: [r1089]
Child: [r1091]