merge of 67f2ba05e3794b7091b464ce3cd91e59e129a5a2
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 9 Sep 2005 05:47:17 +0000 (05:47 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 9 Sep 2005 05:47:17 +0000 (05:47 +0000)
     and e55a199a204af711c51f5c00ac2612d54f98edc2


Trivial merge