change on trunk
a commit on dev in c1
Merge branch 'trunk' into dev
Merge branch 'integration' into trunk
another coimmit
Merge branch 'dev' of /Users/dweatbrook/src/testmm/o into dev
 2013-03-12 Tue 21:46
 2013-03-12 Tue 21:47
 2013-03-12 Tue 21:48
 magic merge from
Merge branch 'integration' into trunk

Conflicts:
	c1.txt
Merge branch 'trunk' into dev
Merge branch 'integration' into trunk
Merge branch 'trunk' into dev
Merge branch 'integration' into trunk
Merge branch 'trunk' into dev
 going to test promotes
 going to test promotes
 going to test promotes
Merge branch 'integration' into trunk