merge of 389a6b49ea576bc4497ab65b4d78d6a487c90d2d
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 4 Feb 2006 17:13:07 +0000 (17:13 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 4 Feb 2006 17:13:07 +0000 (17:13 +0000)
     and ecdfae8924d6c3ddfeb4f20ff811f18b2bca889f


Trivial merge