merge of '020488f3ba9e81e4178652d978f708c79e8d7e01'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Sep 2007 08:50:24 +0000 (08:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Sep 2007 08:50:24 +0000 (08:50 +0000)
commit7cb356bc5fbca281f08aa4fb9bbaa104c8a7698c
treee96d5e6d7e68c1192f468f94b228d7e2277cf026
parenta0cdc9273d0d04c9adb075850206f7634d3658b9
parentedaf3f381d490ff384112e892cbaaeb1582c7d48
Merge ... '020488f3ba9e81e4178652d978f708c79e8d7e01'
     and '1ffb54e79b9df71a0ee9e03df1052efbedd65396'