merge of 4a7910f6f324ae55c1f42b4a22cbea6651e48ced
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 12 Feb 2006 06:14:45 +0000 (06:14 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 12 Feb 2006 06:14:45 +0000 (06:14 +0000)
     and 8ea0fe4b0de92b762636231b067ef6a7f6137d01


Trivial merge