merge of '2aa738d5c03b83a4132b153cc9c9d76b3b367651'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 Apr 2008 15:20:19 +0000 (15:20 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Fri, 18 Apr 2008 15:20:19 +0000 (15:20 +0000)
commit096785ec3979ed50aace999d853bfa089731fc95
tree36e87aa476094939126cff8fd01023d1476f33cf
parent5d5fa15b377fbe096e19df69cda9e3075cd764af
parent9f3b9cc32f672349c521697566640f2d5cdc8814
Merge ... '2aa738d5c03b83a4132b153cc9c9d76b3b367651'
     and 'c48f66ff9ccc3311bacc8bb4a4c4ed79893a63d4'