merge of '45ba0b76a83341a7b25ca694349a4d574337c856'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 09:47:21 +0000 (09:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 2 Oct 2008 09:47:21 +0000 (09:47 +0000)
commit52b7f87c569f44819a343e6faa7b2be510d5527e
treec7647e00a44ac6c73dfc1d09a7d7bf394d63fbf5
parent37a1f73619d0bb9758877efc53cfcf382103372a
parent88c545e13bae1ce89a9809f289a01b57b19a02fe
Merge ... '45ba0b76a83341a7b25ca694349a4d574337c856'
     and '52e7ace64b2d15b51a75996b485b101f16dd40ac'