merge of '29a8a8c7605ad9df4a27011f49bc1935e05c4b72'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 17:55:01 +0000 (17:55 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 25 May 2007 17:55:01 +0000 (17:55 +0000)
commit2569f5e60e38d164b7b11e08bf979548b319a4af
tree2755ce48a0be8b519c055f5cc196f146761553f1
parent70a1e0671ea5e6e4a59e568c76cc073c512b30c3
parent9dae835ef374adaae20d75eba1109bb307c249bd
Merge ... '29a8a8c7605ad9df4a27011f49bc1935e05c4b72'
     and '9ecb8a369d6f726cbe984f8c91972f2c6bc34f1f'