merge of 4089b02c1852c1619a06b04106854c9297b0bcbc
authorMatthias Hentges <oe@hentges.net>
Thu, 30 Mar 2006 16:48:13 +0000 (16:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 30 Mar 2006 16:48:13 +0000 (16:48 +0000)
commit3b7dddd7bc2d21c17b99a3fae6ae83a495a704f4
tree6a97b0808ef34fc9d2b887e7a613da83f9e5b5de
parent6da5f18190e4348f33125ba1546944e6613eb93b
parent3f4c13aa412fde10108c0484627aa69e6e3d577a
merge of 4089b02c1852c1619a06b04106854c9297b0bcbc
     and 9f344d76f36ce0e29d4c8846cf1ec7be90ab5ff8