merge of a8e888a8558f7e09b0116a15e86437cbee47b180
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sun, 18 Sep 2005 15:18:33 +0000 (15:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 18 Sep 2005 15:18:33 +0000 (15:18 +0000)
     and b9817db6eb0bf96c168e419003466c7235191838


Trivial merge