merge of 24f21a5b3e458f3905aa456dae8691117a730f78
authorMichael Lauer <mickey@vanille-media.de>
Wed, 26 Apr 2006 09:48:01 +0000 (09:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Apr 2006 09:48:01 +0000 (09:48 +0000)
commit646a8894927e518b2ec13830e19abbcb16a9db76
tree37889d6fdc61cd004253c18f6ad437cf5c712aa2
parentce03b3cc2404c910f0cc59cb9ac5535c352f6ff3
parente7a96983952b9867cb5b5e8c09f08affa76f82c9
merge of 24f21a5b3e458f3905aa456dae8691117a730f78
     and 4851cae94858387e98668d170b0a21c082ff7cc4