Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Wed, 2 Dec 2009 06:43:18 +0000 (07:43 +0100)
committerAndre Noll <maan@systemlinux.org>
Wed, 2 Dec 2009 06:43:18 +0000 (07:43 +0100)
commitb0d2e5f940e595486443700998d27053e462183a
tree14b9fe03577a86ff4b562e70da6e3d242e8f5904
parent63c513602a6b6a97cdced053beea0b2d07a9f984
parente60e214339a3bc40db307542ef36d95e8ef6eaf0
Merge branch 'maint'

Conflicts:
Makefile.in
NEWS
NEWS