merge of '228dd3777f4e26267c87ee4671f6679f5fecf430'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 14:57:55 +0000 (14:57 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 13 Jun 2008 14:57:55 +0000 (14:57 +0000)
commit44b4d9e022a91a08240d4175d6dd94b9d2c7ceee
treee5d2eda3c2d27d4a64d40e8c90ed6ff567ec0297
parentc96195d48c13f67e421cf220dfd1cb3f3ce79321
parentf8bd1aaceea24c6b666ca876f66c71ff414ae5a6
Merge ... '228dd3777f4e26267c87ee4671f6679f5fecf430'
     and '420e11219be7df649557c4bbcdec50538362cb21'