merge of '7da15dd442647956379d156f938fbc66c4db5251'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Sep 2007 13:44:32 +0000 (13:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 14 Sep 2007 13:44:32 +0000 (13:44 +0000)
commit92c349c460a4018168476a008a37fd383c4820c4
tree2358a42b91cc2af40500f6db0c25619ee5f7fff8
parenta61a02fe751442b081fb9abb7069a17e77b823c9
parenta5780430c6d3ebe2617217067bbeb5ee5a7152c8
Merge ... '7da15dd442647956379d156f938fbc66c4db5251'
     and 'fbf6625ada3dc98b6ca6bf3250baa56f91b08e87'