merge of '55a31408b86b4036d83b855bbd46f1b1d7a61765'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 19:48:00 +0000 (19:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 19 Oct 2007 19:48:00 +0000 (19:48 +0000)
commita0291fe7d75f7be94e0c5285fd2ce5eb34ae3959
treeea262df92610411e00395f0f400b9dd86018a9d5
parent29643d4a42f6ee5ea1e4381e8cd465e44615287c
parent174f21f49d25ea1445039886787eb7c5ff4150c8
Merge ... '55a31408b86b4036d83b855bbd46f1b1d7a61765'
     and 'aa36aa92826b8f74328b39933671dd201b795054'