merge of 542f6b46587305352d62fe667186ce8ecb2b961f
authorJohn Bowler <jbowler@nslu2-linux.org>
Fri, 2 Dec 2005 16:54:17 +0000 (16:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Fri, 2 Dec 2005 16:54:17 +0000 (16:54 +0000)
     and abdb3c1396c6a41a9593637725c84bf2db2acdb0


Trivial merge