merge of '190a360174ecac0e3cc66fd24f7cfb203033cfd3'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 18:53:15 +0000 (18:53 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 30 Dec 2007 18:53:15 +0000 (18:53 +0000)
commitae5913cf22d54266dd434461c22e69b64df5a5bd
tree0119e25253ec0bdd580d999e67785fc0f89f8312
parent7db9c8a7374efb5585b721dd7555ebe7e9beeb71
parentb6ac0b5af52548abb84df0fc7f7cceb3b1a48108
Merge ... '190a360174ecac0e3cc66fd24f7cfb203033cfd3'
     and 'b86387e484a9b94c2752d8ce5dcfb79742677efc'