merge of 02948f94edc060110b60e3cb3e5b547d77f8c493
authorDavid Karlstrom <daka@thg.se>
Wed, 3 Aug 2005 20:20:15 +0000 (20:20 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 3 Aug 2005 20:20:15 +0000 (20:20 +0000)
     and a4218d106d35f16fd5c3c989fa4443eed9b62dde


Trivial merge