merge of '54d41b90eb39f940315cabcc3f06e21d097472a9'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:47:04 +0000 (08:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 08:47:04 +0000 (08:47 +0000)
commitcd8402cb3e91ab41b1fa4cb7f946e07c44fb77d7
tree00516136ad5b580bdcfd13167db84126c86e0128
parent925ae7cfaa7d68869f6cfe2ba5ba36c5e42736d9
parentb120059dccc4285757586f0969955b4c298daefd
Merge ... '54d41b90eb39f940315cabcc3f06e21d097472a9'
     and '81fc7ef21372b525a566c7050bd637f8bff9c6b7'