merge of 0deeba4cb660a5020ac4c327942edd6b08498456
authorPhilipp Zabel <philipp.zabel@gmail.com>
Sat, 14 Jan 2006 18:31:36 +0000 (18:31 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 18:31:36 +0000 (18:31 +0000)
     and fba844d11d33af8cda04754102aa9c403bf71d1c


Trivial merge