merge of 6859af4fc51969fe6d5b6513f506486d9437a4cd
authorKoen Kooi <koen@openembedded.org>
Wed, 5 Jul 2006 12:11:44 +0000 (12:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Jul 2006 12:11:44 +0000 (12:11 +0000)
commit31d29bc3fc70189155f55351000b8447e03fcbd3
tree050e91065e004baf59b63e26a09cf5d764f2aacc
parent343aace997d3f60281fdee1092de806c35fc787b
parent690b0a58642dbdaa8a2ab4ff9f7b6598a900e1cd
merge of 6859af4fc51969fe6d5b6513f506486d9437a4cd
     and 7ac1989cc542e70bbfa30cce17ca52ca532dd19e