merge of 0b8c4181555b825cbd5881514e7b734305e69368
authorCliff Brake <cbrake@bec-systems.com>
Tue, 6 Jun 2006 12:25:16 +0000 (12:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 6 Jun 2006 12:25:16 +0000 (12:25 +0000)
commit5b9cae90ec69fd147bf189ee778c19a5313a2c45
tree50eb03a62fc3e4e21bb338bbc1f30ae26a864ad3
parent512b3eec0f951ae8646256b86ec3528de6546fed
parent9cb74a63a8171809b505396c6bdea11c8c583a79
merge of 0b8c4181555b825cbd5881514e7b734305e69368
     and 0d0dcc009c37fcecc54e97eba35a6168bb1b18a4