merge of '5f9ded38d3bb3f4a0369515dbb717e835f0acc61'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 22:25:13 +0000 (22:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 31 Mar 2008 22:25:13 +0000 (22:25 +0000)
commit2fc5dfe72aa3b5e60e0bb2593aaea2d48bd3acfd
treeea21d39f01f8aa560dee8bca7084f1d281926f93
parentb6ea6459dfa3dfb16ea37bdcb5ccd7e192cc1d15
parent68a4b3f162280e551787f56e3808c3b551d90167
Merge ... '5f9ded38d3bb3f4a0369515dbb717e835f0acc61'
     and '774a9654f13013fc4f169930d4cfec26a95b97e5'