merge of 678605ef4af7fd23d048b55eb08df1ce8f4d3075
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 28 Aug 2005 15:38:22 +0000 (15:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 28 Aug 2005 15:38:22 +0000 (15:38 +0000)
     and c261104f5142fb845f7ca1428c63d50c9c16dc92


Trivial merge