merge of 6332ba3ac06255d82b54e9a1a69e726c1de4d14f
authorDerek Young <dyoung@nslu2-linux.org>
Tue, 30 Aug 2005 19:30:54 +0000 (19:30 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 30 Aug 2005 19:30:54 +0000 (19:30 +0000)
     and e8386a3fd1880af0122ee50c8a1b249ada79c9ea


Trivial merge