Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
authorBen Schweikert <trikolon@ipfire.org>
Tue, 8 Sep 2009 07:55:37 +0000 (09:55 +0200)
committerBen Schweikert <trikolon@ipfire.org>
Tue, 8 Sep 2009 07:55:37 +0000 (09:55 +0200)
commitf47403a4c1cc198c54291ea16d4c388ff253a9ea
tree2107a4ded6eed17eea75eabb84aa43f29480ba3b
parent2cb7cef9f877c88c82c959e2944ff02a12d068fa
parentcb4fdb52ad4be01ddb32d996710ba743f4492cdb
Merge branch 'master' of git://git.ipfire.org/ipfire-2.x
config/kernel/kernel.config.i586-ipfire-xen