merge of 60f3b0b53da7fd9ca4c8f4c025a26f9843c016f7
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 01:56:41 +0000 (01:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 01:56:41 +0000 (01:56 +0000)
     and 61a885ef092fb6f5203957b4bbecfd07dcd32f94


Trivial merge