Merge branch 'xen' of git://git.ipfire.org/ipfire-2.x into origin/xen
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Apr 2009 13:51:24 +0000 (15:51 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Apr 2009 13:51:24 +0000 (15:51 +0200)
commit3e2f1a1d05011f1c7598b9bce798ac527082a89d
tree67d5143daa315da3646961dbae08d0eb60e748ad
parent765c3d050ce50195103eecbeb628a594a16d274a
parent4203c53659ab2469f82b9bed25d5818189d8a03e
Merge branch 'xen' of git://git.ipfire.org/ipfire-2.x into origin/xen

Conflicts:
lfs/linux-xen