merge of 4f25673bce4a4b71f224f593c0e8891b8d43b7a5
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 4 Aug 2005 16:56:45 +0000 (16:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 4 Aug 2005 16:56:45 +0000 (16:56 +0000)
     and 9525011e1445925b5fb6a335db59a38e8e753ecf


Trivial merge