merge of '0c96c7b5c31b29dbfc8df2a2ec577addd4bb9461'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 21:04:34 +0000 (21:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 17 Sep 2008 21:04:34 +0000 (21:04 +0000)
commit4564c110bfe9eb9578bdf0c90ae99f833fcf20cc
tree3d27a38e326430cee69cd199bbafce71e2cb18e6
parentc15a761ab3c8d3a9fa740897640c8d57dc89a757
parent416c63fe0bd0356757d8fb63db74975a739e69a6
Merge ... '0c96c7b5c31b29dbfc8df2a2ec577addd4bb9461'
     and '6b8c5dfa1242c770d1d6c3f4939f19e2d8ea800d'