merge of 56f9893f46ee578732c4af853c14781b9f2b3471
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 16 Jun 2006 08:03:13 +0000 (08:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 16 Jun 2006 08:03:13 +0000 (08:03 +0000)
     and a56d740871f913f358dd2af204d3195c08b7b909


Trivial merge