+ committing merges from group_syncing branch
Authored by: bworrell 2011-02-08
Parent: [r970]
Child: [r972]