From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 19 Apr 2009 13:51:24 +0000 (+0200)
Subject: Merge branch 'xen' of git://git.ipfire.org/ipfire-2.x into origin/xen
X-Git-Tag: v2.5-beta1~15^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e2f1a1d05011f1c7598b9bce798ac527082a89d;p=ipfire-2.x.git

Merge branch 'xen' of git://git.ipfire.org/ipfire-2.x into origin/xen

Conflicts:
	lfs/linux-xen
---

3e2f1a1d05011f1c7598b9bce798ac527082a89d