merge of '2c3f3df8f990a6610a9f87f048204b154418a06a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 08:58:05 +0000 (08:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 20 Aug 2008 08:58:05 +0000 (08:58 +0000)
commit68e547ccc29b5d19d4c0e1457f36a2e9502b04b2
treee4a9f16e0ed19893af4bc2cb21b9d243ea71c70e
parent324f89e048475e71cda6cfc9700cbd940b026b44
parente5c5d96ae0a25786bfaf34f7a4c70aab56102b18
Merge ... '2c3f3df8f990a6610a9f87f048204b154418a06a'
     and 'fa54a53ed347c26402f271ae2550d35a6849f1f6'