merge of '3c3876e3f4fa037f2c9bfce18e3192822f1557cf'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 6 Jun 2008 13:09:54 +0000 (13:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 6 Jun 2008 13:09:54 +0000 (13:09 +0000)
commit1c4b9cfb6f0a3967ca16513150658a488efa3e85
treeb1b6cf57ac35dd1d836f7a8bf0e1b4a90c657260
parent923c2692e9bfc580eee2a564d5ef8824080f71fa
parent1d30c7c58cff86b1886f52f0b75565206fa2d72e
Merge ... '3c3876e3f4fa037f2c9bfce18e3192822f1557cf'
     and 'e8b3409511829c8c35d2859b5756d0206fbb3016'