merge of 897657fc95b12ea51abbdcb9bb8828bfa5a1caca
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 22 Jan 2006 12:00:56 +0000 (12:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 22 Jan 2006 12:00:56 +0000 (12:00 +0000)
     and bf04667bfe2d9cedd68fc1f220beacb16eccdbf9


Trivial merge