Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 20 Feb 2011 11:44:05 +0000 (12:44 +0100)
committerAndre Noll <maan@systemlinux.org>
Sun, 20 Feb 2011 11:44:05 +0000 (12:44 +0100)
commit9417eae5ca2b9f10d25f769221e8fd91048bc68a
tree4fcd07f7ea06c283333df5e8cf402d9d27a82cbb
parente1cf2e432f14f3a22adbd9855b344fdcf4396192
parent4d5a9b90c3e9cbdff019776d05792beb57fbfa31
Merge branch 'maint'

Conflicts:
configure.ac
configure.ac