merge of '47b76447b7c2487688f831149bc94872f6e96c44'
commitc899cb5ffbe578dd7ce953d74640fcc6e9315a6b
author <thebohemian@openembedded.org> <>
Thu, 15 May 2008 22:23:34 +0000 (15 22:23 +0000)
committer <thebohemian@openembedded.org> <>
Thu, 15 May 2008 22:23:34 +0000 (15 22:23 +0000)
tree74a54495fc7d6ee7d7cd2eb807300f2ca3bc2d07
parentc9b5d2afb594734e7f50fa3ad0632d71ac9ebd33
parent2014f82da665af006ae3dce096590754c26b0fd2
Merge ... '47b76447b7c2487688f831149bc94872f6e96c44'
     and 'e53a5cd6a7325c8cfa3079fff6e7e086127f125c'