Merge branch 'origin/xen'
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Apr 2009 15:40:29 +0000 (17:40 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 19 Apr 2009 15:40:29 +0000 (17:40 +0200)

Trivial merge