merge of b14eb00575e3edb8659a9f31c47e1416187938b7
authorMarcin Juszkiewicz <hrw@openembedded.org>
Mon, 27 Mar 2006 20:05:08 +0000 (20:05 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 27 Mar 2006 20:05:08 +0000 (20:05 +0000)
commitc7a880c245a417ba416933237b9684f1b4ccffca
tree2e4079259e2bd92b0e5a1b3f23ea2364eede1ed4
parentdcfa885928bbaf55d4b3236a1b07360a718d10b1
parent0c49ca03295c8be002a9ebd649f9023d26314ac9
merge of b14eb00575e3edb8659a9f31c47e1416187938b7
     and d666453b1d27ca8088768cfc910fd4bd31f2682c