merge of 5c10c32633c6d23ce9ff5b6ba59db4ca12198c88
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 5 Feb 2006 06:27:22 +0000 (06:27 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:27:22 +0000 (06:27 +0000)
     and 8f6968ad1301cc31f3e3ac81867844322372a640


Trivial merge