+ committing changes before merge with trunk
Authored by: bworrell 2011-02-08
Parent: [r966]
Child: [r968]