merge of 1d77723ab3664440912bed42625259c5a156e94e
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 15 Nov 2005 06:36:15 +0000 (06:36 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 15 Nov 2005 06:36:15 +0000 (06:36 +0000)
     and 63e5b79a648b18956dc5b36670316f37ea851914


Trivial merge