merge of de96ee4ffd6b983d21a661eea91670155cdf3192
authorMatthias Hentges <oe@hentges.net>
Wed, 12 Apr 2006 14:52:23 +0000 (14:52 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 12 Apr 2006 14:52:23 +0000 (14:52 +0000)
commit4d16218496558eef1d39ed7e70103c76fd31ea01
tree4a6728626c06fa63e0c1ac9b28bc896dff5cd49b
parentad7d5e886ba145e2bc371b4fda704e09c45edd36
parent0e66d8c3bcf2e00f0f71a198f1d41523c3db0b71
merge of de96ee4ffd6b983d21a661eea91670155cdf3192
     and ed5c3f3e7e11b0bf1767740e26ef8b4a21089be5