merge of '85bed711422189f6cd0b95f0a006355d223421ba'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Jan 2007 11:18:11 +0000 (11:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 18 Jan 2007 11:18:11 +0000 (11:18 +0000)
commit48bc9563ce82fa7602fa718282c8df5dce871136
tree28430c54fedcb1596681bf2dafdd595b4307ff68
parentac5f0dfc6727c4877c6cb5d1ca1849ff8ec1f607
parent2336537385c231cec71421c993e914ee0b95dbbe
Merge ... '85bed711422189f6cd0b95f0a006355d223421ba'
     and 'd6e4205baf5089d50dbd56f79575fa80e4205b58'