merge of '2a64651f43431cae21806db78517b7481f421733'
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 16:19:21 +0000 (16:19 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 May 2008 16:19:21 +0000 (16:19 +0000)
commitedd940192d3cfa231e9116f09720944b73c345b3
treea9811726e2a985416f5cbf60f23d8e49dcf56111
parent5d6c8d86679e3b2ef34b6e7323d6043945845451
parente5100bbf7a08eeffe820c30cecbbaef93bea991f
Merge ... '2a64651f43431cae21806db78517b7481f421733'
     and '522710aedfdaaa917b29d9efccf340e5109071bd'