merge of 5a11cecc6df40454f52ac963fdc178b273327c14
authorPhilipp Zabel <philipp.zabel@gmail.com>
Wed, 24 Aug 2005 18:58:04 +0000 (18:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 24 Aug 2005 18:58:04 +0000 (18:58 +0000)
     and 74801abfe9e66d4dbdeb7f2ac609b79f663a8558


Trivial merge