merge of 2688bfa9b672d5b4d8734a288aa8b1e77ee47a60
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Wed, 28 Jun 2006 23:02:09 +0000 (23:02 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 28 Jun 2006 23:02:09 +0000 (23:02 +0000)
commit7e91a61ba8b5b1e3510c7ec1505ac71a3a0ce6b4
tree826d8408d48dcc37052ecfe2067f830833df2a07
parentf3ea435114c6d51e41ac7e9474e3e223277427a0
parent8ae098ac7348611935439c2ebc61c9165b046a9e
merge of 2688bfa9b672d5b4d8734a288aa8b1e77ee47a60
     and 451e0728f5380a834da5ad8ecd79994cf6f12315