merge of '0ffedb7c7f00db7f23e28aec3cbb44abdd01876f'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Sep 2007 11:06:30 +0000 (11:06 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 6 Sep 2007 11:06:30 +0000 (11:06 +0000)
commit2ddfdf8f8bc107332602466cbda4dfe96497d106
tree8f005b1d5ea3d6224459f3012442b4824e7e175e
parent758cda1d54508a6bcb16f18ee0f958063a0c1880
parent026bb0e021f9c52f0d5707fd140fae1c6457c9bf
Merge ... '0ffedb7c7f00db7f23e28aec3cbb44abdd01876f'
     and '350212948f342818ac60fcc5f0cfe013dd157774'