merge of '40f7de1bbc9465cdefd2658e7f34b24d7d121a82'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 12:50:34 +0000 (12:50 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Sep 2008 12:50:34 +0000 (12:50 +0000)
commit035d5b2e4e0a3543d3564e55d99cf888d262028b
tree294959272d361c98c71dffd4a561b1ac9efae4d3
parentb17e32936d236a50a3cb8af6984dc03b1ebc3eb6
parent6a86433f74983c1e91b1436997551e9fb9923f98
Merge ... '40f7de1bbc9465cdefd2658e7f34b24d7d121a82'
     and '5d50023ad7c56a1839a196c074ca30c9200fbd15'