merge of 3fb414835838a0d53a0dc370c4a0c87cfec614eb
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 06:51:27 +0000 (06:51 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:51:27 +0000 (06:51 +0000)
     and 8703efdf079cb272c994f94de7414694d20cc052


Trivial merge