Merge branch 'master' into portable

author Mark Wielaard <mjw@redhat.com>

Tue, 20 May 2014 08:45:10 +0000 (10:45 +0200)

committer Mark Wielaard <mjw@redhat.com>

Tue, 20 May 2014 08:45:10 +0000 (10:45 +0200)
author Mark Wielaard <mjw@redhat.com>
Tue, 20 May 2014 08:45:10 +0000 (10:45 +0200)
committer Mark Wielaard <mjw@redhat.com>
Tue, 20 May 2014 08:45:10 +0000 (10:45 +0200)
diff --cc backends/ChangeLog
Simple merge
diff --cc libebl/ChangeLog
Simple merge
diff --cc src/ChangeLog
Simple merge
author	Mark Wielaard <mjw@redhat.com>
	Tue, 20 May 2014 08:45:10 +0000 (10:45 +0200)
committer	Mark Wielaard <mjw@redhat.com>
	Tue, 20 May 2014 08:45:10 +0000 (10:45 +0200)
		1	2
backends/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
libebl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history