merge of bab884274cd6fd78f200a46137109bede4c17e25
authorPhilipp Zabel <philipp.zabel@gmail.com>
Fri, 2 Sep 2005 21:36:23 +0000 (21:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Sep 2005 21:36:23 +0000 (21:36 +0000)
     and d83dde07166637966b2851273fb1192e98171072


Trivial merge