merge of abb4ac4d99500dd9fcf6c133d3075c483c01868d
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 5 Oct 2005 19:58:35 +0000 (19:58 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 5 Oct 2005 19:58:35 +0000 (19:58 +0000)
     and dcae9da292239ca2d00a7cf805bfea8df8788bc8


Trivial merge