merge of 3c9f4ce15100759b2690593146500292e2ebce4f
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 30 Jul 2005 20:03:56 +0000 (20:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 30 Jul 2005 20:03:56 +0000 (20:03 +0000)
     and c59a2ecfda2f1be87d5b4492b21cd68682012044


Trivial merge