merge of 3a3ce2ba295b051169b23016abf8c2dc694c11f2
authorHolger Freyther <zecke@selfish.org>
Sat, 27 May 2006 18:36:06 +0000 (18:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 27 May 2006 18:36:06 +0000 (18:36 +0000)
     and cd5dfac4524135d71f6f42fb7d1288b700ec5d38


Trivial merge