merge of b6008583593bfaa7470e73a2fd374f3a43d499d7
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 31 Jul 2005 18:38:54 +0000 (18:38 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 31 Jul 2005 18:38:54 +0000 (18:38 +0000)
     and c3ddcc365753e2e7ccc7021dbf8d917809ec978d


Trivial merge