merge of 7a60456e1148db739739d3d0147b828bffebf944
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 19 Nov 2005 10:48:16 +0000 (10:48 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 19 Nov 2005 10:48:16 +0000 (10:48 +0000)
     and 7afdee4aedea90fb1bd7b32d135cd76f2bcfb368


Trivial merge