Merge pull request #944 from ermshiperete/bug-novell-496138

author Zoltan Varga <vargaz@gmail.com>

Wed, 29 Oct 2014 23:06:05 +0000 (19:06 -0400)

committer Zoltan Varga <vargaz@gmail.com>

Wed, 29 Oct 2014 23:06:05 +0000 (19:06 -0400)
author Zoltan Varga <vargaz@gmail.com>
Wed, 29 Oct 2014 23:06:05 +0000 (19:06 -0400)
committer Zoltan Varga <vargaz@gmail.com>
Wed, 29 Oct 2014 23:06:05 +0000 (19:06 -0400)
diff --cc mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
Simple merge
diff --cc mcs/class/corlib/corlib.dll.sources
Simple merge
author	Zoltan Varga <vargaz@gmail.com>
	Wed, 29 Oct 2014 23:06:05 +0000 (19:06 -0400)
committer	Zoltan Varga <vargaz@gmail.com>
	Wed, 29 Oct 2014 23:06:05 +0000 (19:06 -0400)
		1	2
mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs	patch \|	diff1 \|	diff2 \|	blob \| history
mcs/class/corlib/corlib.dll.sources	patch \|	diff1 \|	diff2 \|	blob \| history