merge of '9d15f77b27c19d97e354262e4913bd37bb6b02d1'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 08:39:22 +0000 (08:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Sep 2008 08:39:22 +0000 (08:39 +0000)
commit0528da9a31a5dc67f47c02be2b2b64fe0aca1f4a
treeb984f26f5b3d0ddb17a8cc50f86593a386960047
parent17d2b8a8282c911f3d394fac1d042912c1f7f0ee
parentf02abf811dbf693a2e97a071c5e0cdcb0eb15908
Merge ... '9d15f77b27c19d97e354262e4913bd37bb6b02d1'
     and 'e0dabd88d80820428cf042b0f89980e7027b18e6'