merge of 04349a15fcf0be8c719e5faa20f6d3b7173944ca
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Tue, 27 Jun 2006 20:51:14 +0000 (20:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 27 Jun 2006 20:51:14 +0000 (20:51 +0000)
commit5af282b972026bf28c5ed62db5bcf5f60e7b247f
treec96aa1dc967959fce0001fc64e01f0c0b01f7b90
parent5cc48bfdfe896ee92836d99de04eb8acb11cde3c
parent5a8d7be5e5c209eb5121d4bfa7f6702279a29955
merge of 04349a15fcf0be8c719e5faa20f6d3b7173944ca
     and 7817ada25bed9fc5f2f70a500853200cb2219b68