merge of '526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 7 Aug 2007 10:49:26 +0000 (10:49 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Tue, 7 Aug 2007 10:49:26 +0000 (10:49 +0000)
commit1a0743356e12a0a7e5aa7210befb2cac329af824
tree50d14123e66970238b22a00e8433f9eb55ee2ba0
parent23837f3256a8230816c7c9911a84d0f566c958a9
parent17473b40b8ccb53e566546b468d57700a3fb4332
Merge ... '526e95d4cdf1cd30f201f0f6f8abbd0f7afbceab'
     and '614f3cd98efac6f55a67e861fea4265d5be81963'