merge -r 53370:58178
authorKonstantin Triger <kostat@mono-cvs.ximian.com>
Mon, 20 Mar 2006 13:31:41 +0000 (13:31 -0000)
committerKonstantin Triger <kostat@mono-cvs.ximian.com>
Mon, 20 Mar 2006 13:31:41 +0000 (13:31 -0000)
commitfefd6f1d0578964f8ec15e061c5b2db1f9ef4fbc
tree8b700d12751cac9094845e6b3a92c2becbe338c7
parentd42aff01c0840b8794a16debb9202416e15cb080
parent151ceb1347c3be77ded7139aae02e1ace9229574
merge -r 53370:58178

svn path=/branches/mainsoft/gh1.7/mcs/; revision=58179
mcs/class/System.Data/System.Data/ChangeLog
mcs/class/System.Data/System.Data/ConstraintCollection.cs
mcs/class/System.Data/System.Data/DataSet.cs
mcs/class/System.Data/System.Data/MergeManager.cs
mcs/class/System.Data/Test/System.Data/ChangeLog
mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest2.cs
mcs/class/System.Data/Test/System.Data/DataSetTest2.cs