merge of 344cfe464bbb04179a1e0d2688978bfb90f8c882
authorFrederic Bompart <frederic@unknown.openembedded.org>
Tue, 20 Sep 2005 10:29:08 +0000 (10:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 20 Sep 2005 10:29:08 +0000 (10:29 +0000)
     and 504eb28adf5c55172d82352ebbb76796781ed38a


Trivial merge