merge of '5ad99f74f7f6900d8889b6026325fc81dd39c9ff'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:03:35 +0000 (01:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Feb 2008 01:03:35 +0000 (01:03 +0000)
commit916326780dc762bb84bb24526a0ed628fff3d602
treeb462aaefc54ca15f78d4790601eb7ca93e231c66
parentc9e8762b3c2c940689bee98c2f78af69b47407e2
parentaaa6972c4734b76385664c862760dcdb4c63d6fe
Merge ... '5ad99f74f7f6900d8889b6026325fc81dd39c9ff'
     and 'dbd68acb5b5a6b7f90a7e82b19706ec980e6356f'