merge of '1cd5e943ef54d13e64d37d770a002c30566c92aa'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 18:15:19 +0000 (18:15 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 18:15:19 +0000 (18:15 +0000)
commitd244d3d2920a8c04f79824c8ff3bbab43b3ed1b8
tree596829d300b5c8d38c5b59a2f3e9332a10208a4c
parent4b97055203367b551a5091f699bc02c36d883af0
parent213303a5804e0061e86fc9c3b7dfc40c3c8d9037
Merge ... '1cd5e943ef54d13e64d37d770a002c30566c92aa'
     and 'a139347e51e6031cfc0bad60233a7c2d122eb2b0'