+ merged multiple_rule_edit branch into trunk
Authored by: bworrell 2010-04-08
Parent: [r744]
Child: [r746]