Merge branch 'master' into portable

author Jan Kratochvil <jan.kratochvil@redhat.com>

Thu, 25 Jul 2013 09:33:44 +0000 (11:33 +0200)

committer Jan Kratochvil <jan.kratochvil@redhat.com>

Thu, 25 Jul 2013 09:33:44 +0000 (11:33 +0200)
author Jan Kratochvil <jan.kratochvil@redhat.com>
Thu, 25 Jul 2013 09:33:44 +0000 (11:33 +0200)
committer Jan Kratochvil <jan.kratochvil@redhat.com>
Thu, 25 Jul 2013 09:33:44 +0000 (11:33 +0200)
diff --cc ChangeLog
Simple merge
diff --cc config/ChangeLog
Simple merge
diff --cc configure.ac
Simple merge
diff --cc libdwfl/ChangeLog
Simple merge
author	Jan Kratochvil <jan.kratochvil@redhat.com>
	Thu, 25 Jul 2013 09:33:44 +0000 (11:33 +0200)
committer	Jan Kratochvil <jan.kratochvil@redhat.com>
	Thu, 25 Jul 2013 09:33:44 +0000 (11:33 +0200)
		1	2
ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
config/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
libdwfl/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history