merge of 23fbf27774beb8da3d4bc3672a8415bfd24eb369
authorKoen Kooi <koen@openembedded.org>
Fri, 24 Feb 2006 00:11:18 +0000 (00:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 24 Feb 2006 00:11:18 +0000 (00:11 +0000)
commit7e4a8f3e8c58a591970c7abddfc549e1928850c5
tree0fe70e5b9fd1562985a14d8c24db15fffe604a4f
parent8ca634d242dca9bb625cbc9cf5eb1934c5319bf4
parentafbe63e2dc6fbb8df0d9b152d87f292d1e797557
merge of 23fbf27774beb8da3d4bc3672a8415bfd24eb369
     and e36ab3ae9c4e81b92e9a4b650a37af9a6a4174cf