merge of 'a536e1f1c106f600dacb9b7c677edf69297378fb'
authorRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 16 Jan 2007 19:36:02 +0000 (19:36 +0000)
committerRolf Leggewie <oe-devel@rolf.leggewie.biz>
Tue, 16 Jan 2007 19:36:02 +0000 (19:36 +0000)
commit73aaf56204cd4ebdabc4528d86ad1128534248b3
tree08efb559a7a79403b7c06bf5c131e8e1b662ad69
parent16cb2f321befd4c69c9c938c2ec8386fcfb3336a
parent1774f75a2a4e80dbcb4995bf88bea9d2bd6b469b
Merge ... 'a536e1f1c106f600dacb9b7c677edf69297378fb'
     and 'da35453dc23555db9d4d4373003c4e47b502ee30'