Merge branch 'ajakop/12333'

author Abegail Jakop <ajakop@redhat.com>

Tue, 2 Sep 2014 15:06:47 +0000 (11:06 -0400)

committer Abegail Jakop <ajakop@redhat.com>

Tue, 2 Sep 2014 15:10:58 +0000 (11:10 -0400)
author Abegail Jakop <ajakop@redhat.com>
Tue, 2 Sep 2014 15:06:47 +0000 (11:06 -0400)
committer Abegail Jakop <ajakop@redhat.com>
Tue, 2 Sep 2014 15:10:58 +0000 (11:10 -0400)
diff --cc elaborate.cxx
Simple merge
diff --cc elaborate.h
Simple merge
diff --cc translate.cxx
Simple merge
author	Abegail Jakop <ajakop@redhat.com>
	Tue, 2 Sep 2014 15:06:47 +0000 (11:06 -0400)
committer	Abegail Jakop <ajakop@redhat.com>
	Tue, 2 Sep 2014 15:10:58 +0000 (11:10 -0400)
		1	2
elaborate.cxx	patch \|	diff1 \|	diff2 \|	blob \| history
elaborate.h	patch \|	diff1 \|	diff2 \|	blob \| history
translate.cxx	patch \|	diff1 \|	diff2 \|	blob \| history