merge of '09957ec14fdf3babf0d22d779c7264d24330e535'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 9 Aug 2007 10:57:03 +0000 (10:57 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 9 Aug 2007 10:57:03 +0000 (10:57 +0000)
commitb9a30358ae133ede815cbf2c4b31ff1977035e30
tree48570a08176de392a718f1712e75379af2e270c1
parent386d4732c8c4b60c60dc671e97d5a667ebb5e140
parent58259f5baa7ae15a19edbfb0eb52ecef22467e0f
Merge ... '09957ec14fdf3babf0d22d779c7264d24330e535'
     and 'c03b12513a0d9faea02ff87386f5cb243f7ece3e'
conf/distro/include/preferred-gpe-versions-2.8.inc