merge of 9258879eec9f4765e063760525cb63d32a681bc0
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 08:03:28 +0000 (08:03 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 08:03:28 +0000 (08:03 +0000)
     and bb4ad068496963750f8030c0272eab6462a28b86


Trivial merge