merge of '212ab031e33707ab289fca4bc893d1f946e6f8e6'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 13:03:43 +0000 (13:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 1 May 2008 13:03:43 +0000 (13:03 +0000)
commit1395202a2ee381028d7535cd082c3064f650de74
treec36c83d13bac0459da6d042e7d95712ee21f2235
parentcc35c867206128b3a81036132a1ce827f1a47113
parent20face5dc2bfe22d6fb747c36ebfc70cad854fa4
Merge ... '212ab031e33707ab289fca4bc893d1f946e6f8e6'
     and 'd935cd87c7c9021470bafc4d24b4faafe4d6c58b'