merge of 'd85165b6d72282ba94622c1c0d0c9c3e4a6be821'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 14:50:26 +0000 (14:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 14:50:26 +0000 (14:50 +0000)
commitcfa4aba239d47d49b650dd741daa4b0f21295a3c
treed81541c99da304070f48fce545e8c66507573735
parent31e5a50374e58b992005a901def2d9bf0779b6c6
parent8ed8a583846622b6cf5eab5b2185ccf914ca85ca
Merge ... 'd85165b6d72282ba94622c1c0d0c9c3e4a6be821'
     and 'e5325ab8e47ca7688fb1a8e72b249d38ff3a7b4c'