merge of 4d90ab5d26d197102fc3d27dd18f5a9756bb5478
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 21 Sep 2005 10:10:40 +0000 (10:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 21 Sep 2005 10:10:40 +0000 (10:10 +0000)
     and b53f933a2781412213b8f358f75b788c7dfb5844


Trivial merge