merge of '481cda07f650eec08e83f5f63d522be2fbcb6ff1'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:37:42 +0000 (13:37 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Sat, 23 Aug 2008 13:37:42 +0000 (13:37 +0000)
commit7943f89b0872a58247bea0b12378bc54e310213e
tree66a4413980a0dc17c0210f82ae2e8deb4ba2c0eb
parent548b4dda4ac765a278976c9face5d815b0c0e732
parent1bf407397b92080940f9530dfd2ed126d9744a0e
Merge ... '481cda07f650eec08e83f5f63d522be2fbcb6ff1'
     and '75bc4e3a2d2ba7222114e2b45642c31b8e2057dd'