merge of 'a42936f86bfc2fe328a115dd331286fc71e8156a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 09:33:41 +0000 (09:33 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 26 Dec 2007 09:33:41 +0000 (09:33 +0000)
commit5dd4625a559a7b31fd670471ea635af295e3ce8f
treed0bbacc6b2998d193e85e343ed425343f451ecf0
parent096dc11ebebcaebb23c4322f1b84966688905899
parent7c44c42f787e3c7d1103955b0a88c2138577ce63
Merge ... 'a42936f86bfc2fe328a115dd331286fc71e8156a'
     and 'c0e108d768a455005e5b9ad28796112f203c3de6'