merge of '2d7114b5bd553a86afdf241ba00411ba1e6d9bec'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 23:11:47 +0000 (23:11 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 8 Feb 2008 23:11:47 +0000 (23:11 +0000)
commita44b480e7b2e5751c2655fac1f770c9e360e6a62
treef4a51facdeb4c99bbc9378ff99e9fdb32e6d3611
parentb6764cf32ec93547531130dca364fb95e1c495f4
parent706f895f76c0f1cbb71cce85d0f21ba3f1611d23
Merge ... '2d7114b5bd553a86afdf241ba00411ba1e6d9bec'
     and '2e4d5c372cfad0e6d1d535ecbebee7006a637b97'