Fix some conflicts in the rebase/merge
Authored by: Rick Copeland 2009-11-06
Parent(s): [7ab6ff]
Child(ren): [d130fc]