merge of '3cb55f3839ae88970dfa5acd881fccfbd3a79fc8'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Sep 2007 00:43:56 +0000 (00:43 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 2 Sep 2007 00:43:56 +0000 (00:43 +0000)
commit7cbee4efc718590c6efe9fa9b24f7d7a9a9d98a7
tree4fb85507378bc3471d9fa800124c08e5ec038eeb
parentba5230ce01bc589f48a37792b8b33b1e618806ff
parent351cd9530d15979dc326d70e3e996a5c33eb869f
Merge ... '3cb55f3839ae88970dfa5acd881fccfbd3a79fc8'
     and '46598fbaed38fc3e79d96b6bb061410fbea84c3d'