merge of c495c19159f4a954f2b8e7b6ecd3c1e60fbf15df
authorJohn Bowler <jbowler@nslu2-linux.org>
Sat, 21 Jan 2006 05:54:52 +0000 (05:54 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 21 Jan 2006 05:54:52 +0000 (05:54 +0000)
     and def6c51e33aca81d009da117feae54ed9217310e


Trivial merge