merge of '23c1fc66a29e279d192d2dee8c7a1603361063b7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 21:19:04 +0000 (21:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 25 May 2007 21:19:04 +0000 (21:19 +0000)
commit4cb3eea839ce10c654652c45a9fd93efe9b4d9c4
tree84b4b55b7771a2a2e6c1c49677f89312dffa453a
parent008392646dd1410d6bd32380c6e6d340b217ea8b
parent2569f5e60e38d164b7b11e08bf979548b319a4af
Merge ... '23c1fc66a29e279d192d2dee8c7a1603361063b7'
     and '6f71e952a3b0871abd3462a5811c09eaeff9a20b'