fix merge conflict 95/1895/1 submit/trunk/20121001.220016
authorGraydon, Tracy <tracy.graydon@intel.com>
Mon, 1 Oct 2012 22:00:01 +0000 (15:00 -0700)
committerGraydon, Tracy <tracy.graydon@intel.com>
Mon, 1 Oct 2012 22:00:01 +0000 (15:00 -0700)
commit5a9f8db8cd1a0a9e43e03cc5df32ce6fe28dd70e
tree5161b3ac50931c6163b20e08cf7dc00dcf9c5b24
parente161229c486e6861efd47747606f922d8e8d06d3
parent80f9da0003630d3b81c1c7981834a38a337cad12
fix merge conflict
git-obs-mapping.xml