merge of 0185cf2d013d2c0935d8f930c1bd794ff7d2defe
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 4 Apr 2006 22:18:34 +0000 (22:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 4 Apr 2006 22:18:34 +0000 (22:18 +0000)
     and ab41e679a9bfc6bc2294e34b63fd70a9ef105ead


Trivial merge