merge of 5f2c5f5ba72b4c3cfbe728107dd0158e960cf154
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 30 Jul 2005 17:46:49 +0000 (17:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 17:46:49 +0000 (17:46 +0000)
     and 652a4835aedfa3b630066ce1f9aaa47035a090e9


Trivial merge