merge of 0cd761de98072480e6e68e383c48e38bedd2f557
authorPhilipp Zabel <philipp.zabel@gmail.com>
Mon, 20 Mar 2006 09:39:17 +0000 (09:39 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 20 Mar 2006 09:39:17 +0000 (09:39 +0000)
     and 52ebc3713b5433a8127e7b025d8d2f4f085214e8


Trivial merge