merge of '4a9764846eca8e7a6608990c71feaab1b82bda1f'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Dec 2007 01:37:18 +0000 (01:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 24 Dec 2007 01:37:18 +0000 (01:37 +0000)
commitb479571478cf0d1d517f1a35aaa4e66f4f3fe8c2
treed4fd98ceeae2a4cfc137ad7635a6080b8eed9c08
parent5a327da93307827512a2e1f33f3d4cd0a91f8f5f
parent516565b4587daaf2852a2e19a182cb17b78d3b7a
Merge ... '4a9764846eca8e7a6608990c71feaab1b82bda1f'
     and '5ac15bc50757ca4ed18bce46192c87c5141b1068'