merge of 43210f598efbfe0448fd76adff3e7c54597c1238
authorMatthias Hentges <oe@hentges.net>
Sun, 21 May 2006 11:54:58 +0000 (11:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 21 May 2006 11:54:58 +0000 (11:54 +0000)
commitbc6202b190738b8a44174cbfff98a608d0ee8b45
tree12b2dff771699081a77d79873864c26b8aaee9d3
parent0abe42ac0868f2b4fe996e824049afa5fa2ebf3d
parent229b799c419f274c7aa3fc537f1cc74d291aaf0f
merge of 43210f598efbfe0448fd76adff3e7c54597c1238
     and 9f0cf5f918714fddd0ea186781b4d1a4ffc876bd