merge of a08a8c2025a026a3e9ef70601ea1f262a6fa6f33
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 7 Sep 2005 09:27:59 +0000 (09:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 7 Sep 2005 09:27:59 +0000 (09:27 +0000)
     and feb0ee96425b8d0d94fb0ed0f4b74d16f9e7678c


Trivial merge