merge of 36bba38125b0902fe1eaddcaeaa996528cbb7364
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 29 Nov 2005 18:03:16 +0000 (18:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 29 Nov 2005 18:03:16 +0000 (18:03 +0000)
     and c125c8208cfb52ff3cc6e96a78bf4376459ea611


Trivial merge