merge of '5c07880b5834b7705ca79c09053c32f9161e0aeb'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 13:07:51 +0000 (13:07 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 28 Jun 2007 13:07:51 +0000 (13:07 +0000)
commitc1799b4395b83e58df4f9841d8e9de15b09f60d6
tree1a9b85d1185beb01f791c9e529a7bae1a3e58a4c
parent4f2658e332b65a6bd7a2aef568ed04cad1571945
parentd65e22a1a6b229985413ec429d04fd964fc8ba9c
Merge ... '5c07880b5834b7705ca79c09053c32f9161e0aeb'
     and 'f76780cf5858e364ec4d16a3a725b62bad681348'