merge of 4c6d0f0d1bdf70c5a10f201ed5bdc2fc9f01c0a8
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 13 Sep 2005 13:37:19 +0000 (13:37 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 13 Sep 2005 13:37:19 +0000 (13:37 +0000)
     and 7e21aa6ee0ce154c365acb190ba86fffc0eaca8b


Trivial merge