merge of '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 11:33:15 +0000 (11:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Dec 2007 11:33:15 +0000 (11:33 +0000)
commit70b2f4f88145fc9955207cd7a8382d5d70a769ee
treefb9c7335ac53263edcc9030b610b28fad8a914db
parent403d83e9cd508a0f290f0647163e3745fa91fd27
parentc2ec10e5520b850581a6979eb138be41bc6d277d
Merge ... '3e94a66ec6e7fc142c7d737c555c1f7330a6b02a'
     and 'a1dfdac15b4a615ff22cad20ebbf724bcf12fa04'