merge of 2fd623e8d76c78b3918a5881b42ffab1609a05d0
authorMichael Lauer <mickey@vanille-media.de>
Tue, 21 Mar 2006 00:16:38 +0000 (00:16 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 21 Mar 2006 00:16:38 +0000 (00:16 +0000)
commit4d265c0aba835e1833d631154718ddcefe60faee
tree89a8be303b51d9ca6d397a6c70c50e149f4a2b0e
parentfcb25687f94b18745daac744cd0e41cad324edf0
parentd3069e7f64a42a60e78a187399325b4990e3d222
merge of 2fd623e8d76c78b3918a5881b42ffab1609a05d0
     and d6ae2145fa0116f5eb9376594a80f8bf63c64b86