merge of '159abf710e505eb360cea20e22b6f1fa84eb6e4a'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jun 2008 10:37:25 +0000 (10:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jun 2008 10:37:25 +0000 (10:37 +0000)
commita18c21713f039889f9b94f4f24a8a1988a904d20
tree0df9dc9157a63e09d1a6b762ce6b290e68d03dc1
parentb24bb7acb684bca2f80dbbd5c812421bf0ee04cb
parent3cb3300af5400f75c5d63ad3608a94ac0cd48ccc
Merge ... '159abf710e505eb360cea20e22b6f1fa84eb6e4a'
     and '3f37d09caa1458ff05bbfdf2d47ff7dfc82d2f10'