merge of a43a3081d043237ce284af591c69b35171e746be
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 14 Aug 2005 18:00:44 +0000 (18:00 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 14 Aug 2005 18:00:44 +0000 (18:00 +0000)
     and b91f743ce475bca1b138c7fd63260e83a34f53c2


Trivial merge