Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Mon, 7 Dec 2009 17:06:55 +0000 (18:06 +0100)
committerAndre Noll <maan@systemlinux.org>
Mon, 7 Dec 2009 17:06:55 +0000 (18:06 +0100)
commit05527588bd503e4748d801b641a9e3a6556525ad
tree18d4273cdf0adb2b2f6cb50cbaa160bb674a138e
parentb0d2e5f940e595486443700998d27053e462183a
parentb764977e54d34650a4529cc05abb4ca7603735f7
Merge branch 'maint'

Conflicts:

Makefile.in
NEWS
web/index.in.html
Makefile.in
NEWS
web/index.in.html