merge of 'b0ae8d7e97486b45257d7443b82c3e7bd318a2a9'
commit2014f82da665af006ae3dce096590754c26b0fd2
author <thebohemian@openembedded.org> <>
Thu, 15 May 2008 19:31:09 +0000 (15 19:31 +0000)
committer <thebohemian@openembedded.org> <>
Thu, 15 May 2008 19:31:09 +0000 (15 19:31 +0000)
tree84ceb414cead8ee0a82209f26d4baa06ad623c53
parentb2971e7120654e31cd06b61572d250d163d43263
parent6923c6ee9efc8e3b685a153bc28342d62471e7bf
Merge ... 'b0ae8d7e97486b45257d7443b82c3e7bd318a2a9'
     and 'c623b8256cde670674edff5cc4131f32826906df'