Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Mon, 21 Sep 2009 20:19:02 +0000 (22:19 +0200)
committerAndre Noll <maan@systemlinux.org>
Mon, 21 Sep 2009 20:19:02 +0000 (22:19 +0200)
commitfcb24360b1b14c9fe0e510282cf85f4e112eaf23
treecc33391b53dbb248d4188f3056036faff3779abf
parent305ea292b101b906e738d7bf756d4921497198d6
parent8aae00a4d57206cef9bd85639c551e391a337edf
Merge branch 'master' into next

Conflicts:
NEWS
NEWS
configure.ac