merge of 'af88183f8a1fc8ac383ef392272c0f8dde354024'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 17:39:57 +0000 (17:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 22 Oct 2007 17:39:57 +0000 (17:39 +0000)
commit9d1d85b2cf12d713ef60d369d5dffad2d6c3ef32
tree5cd78aa560ff0e3e3306885b0c65a1903aaa0a8b
parenta94c976932ba314527bcb8faa7a6589ef0bc7266
parent90a5e1115963c246355e4224828952b69e44c802
Merge ... 'af88183f8a1fc8ac383ef392272c0f8dde354024'
     and 'c6caaa43c1d9168b1c89bc83e7ec1c38ca284d88'