merge of '0cf8f2c5ee855d39a6405f986c68c060c315c548'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Oct 2007 13:42:57 +0000 (13:42 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 16 Oct 2007 13:42:57 +0000 (13:42 +0000)
commit69e79e419a03961aef7acbe99c101d74e4f89680
tree99e4a4f1985daf1ca0e04481f8c523807a87748f
parente2d5e0633b6e5a02c2ec096ddb8b46e6ba3c4a8d
parent32023738226e13ffabc042ab46c8506f101f2095
Merge ... '0cf8f2c5ee855d39a6405f986c68c060c315c548'
     and '4f77470c64f631cf18c5d73d963e41e28fe097bb'