merge of '4ced2a6d71f9eeefb5a83f0584348d666b56065a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 9 Jul 2008 19:35:07 +0000 (19:35 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 9 Jul 2008 19:35:07 +0000 (19:35 +0000)
commita6e2b02752c0a0feab1faeceeec2ea32244ec54a
treebb0937807458a828e5e303bb68ecfd851f96ea01
parent10be83b24e06a983e8fb8bb7f80377befaf55cb7
parent28dfe0ee7737a7702de101bb6ba1e72f7d408f03
Merge ... '4ced2a6d71f9eeefb5a83f0584348d666b56065a'
     and '9a6c7bec4be483b56e6305d978adce9e49f1e29c'