merge of '6aff048ce0e2244277e9b1398c4a400bdd758e30'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 11:27:58 +0000 (11:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 31 Oct 2007 11:27:58 +0000 (11:27 +0000)
commit76f4d214828d70add344752f734dc3247484bf50
tree9ef735c2be092f813f0187acccba3100b9d7368f
parent566c8bb147d8ba79662edcd755883793e0c945f5
parent02fa6e148736885099b67b5570819cf1eec59a5a
Merge ... '6aff048ce0e2244277e9b1398c4a400bdd758e30'
     and 'eca725be04182c9d2ebab13eddbe22f7e48c2b17'