merge of baa4b93cbf7cd2b34806985948c44762c4682d0d
authorKristoffer Ericson <kristoffer_e1@hotmail.com>
Fri, 7 Jul 2006 15:25:24 +0000 (15:25 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 7 Jul 2006 15:25:24 +0000 (15:25 +0000)
     and cbbb31a3ac41c6b9044ddf94693c36ad7b5f7832


Trivial merge