merge of '7bdad48271a5cd7e452da1e8a7fff502ce18c8d7'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:29:44 +0000 (14:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 29 Mar 2007 14:29:44 +0000 (14:29 +0000)
commit26e54152f315fbe47b368fa736afc9f97eb49edd
tree1af12ef6a3f1ef2b066d430b3f09568c4401d883
parent8ad6ed721feab92844b72800b6e9a09430170dd9
parent36d9a4f1fa39a94b5832c2569547dd3bd5106cf2
Merge ... '7bdad48271a5cd7e452da1e8a7fff502ce18c8d7'
     and 'eca2cd6dec5347a592e5ea0f4a5aace6c7e206bb'