From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 12 May 2009 15:13:38 +0000 (+0200)
Subject: Merge branch 'updates'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc18b4da3beeb7f51aec85f6ec578fadc72c5238;p=ipfire-3.x.git

Merge branch 'updates'

Conflicts:
	lfs/util-linux-ng
---

bc18b4da3beeb7f51aec85f6ec578fadc72c5238