merge of '12b22f976a76556942fa1ed3a18167d5e59a261c'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Mar 2007 10:09:10 +0000 (10:09 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Mar 2007 10:09:10 +0000 (10:09 +0000)
commit9b1b6ccc3650d6cd9800b6df57859f56a9d078fe
tree32999788ac3905f0187d507173635124b62d5cdf
parent00ce0b99e32d18063644e813bb4dc5964f2c85a0
parente938931bee988f2887f7960b549b1c4600bf125b
Merge ... '12b22f976a76556942fa1ed3a18167d5e59a261c'
     and '890201ff9b740ceb2b02680d2dede9da64858c14'