merge of 4f79e58603c4d9bc504f3147b0aea55a2d10f615
authorjp30 <jp30@nslu2-linux.org>
Wed, 27 Jul 2005 01:49:43 +0000 (01:49 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Wed, 27 Jul 2005 01:49:43 +0000 (01:49 +0000)
     and f8ddb871786be4507baa8fefcbba277fd0cfa367


Trivial merge