merge of '72708eace9dcdb70c5700231b4f92541bb90b6ac'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:17:03 +0000 (19:17 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Aug 2008 19:17:03 +0000 (19:17 +0000)
commit3ffe2ac11fba212832243ec6f5a7cf9f02b2e171
treed05170700c9fc27910b1c2f5b06e3eb96b8fc33c
parentcf695bd65d83f5ced4e586f72c09f7fd5ef13fdd
parent0d1d1187a8683de4b818edf9193cb524c265d097
Merge ... '72708eace9dcdb70c5700231b4f92541bb90b6ac'
     and '91a0ad611226219a56b014a2e89ec3d70647d2eb'