#404 Resolve merge conflicts in file.
#404 Resolve merge conflicts in file.

ronnymgm/csla-light,MarimerLLC/csla,ronnymgm/csla-light,jonnybee/csla,MarimerLLC/csla,BrettJaner/csla,BrettJaner/csla,JasonBock/csla,ronnymgm/csla-light,jonnybee/csla,rockfordlhotka/csla,MarimerLLC/csla,JasonBock/csla,JasonBock/csla,BrettJaner/csla,rockfordlhotka/csla,rockfordlhotka/csla,jonnybee/csla