From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 19 Apr 2009 15:40:29 +0000 (+0200)
Subject: Merge branch 'origin/xen'
X-Git-Tag: v2.5-beta1~15^2~1
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=7a0d389365d01b944ea67e725fad0773653753b2;hp=7a0d389365d01b944ea67e725fad0773653753b2;ds=sidebyside

Merge branch 'origin/xen'
---