merge of 22dc71271d5b2f33b17e7dbea3e143f38d85c8d7
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 01:56:14 +0000 (01:56 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 01:56:14 +0000 (01:56 +0000)
     and 382394264d43c74e3d6cc3b5438f2dc2322ba657


Trivial merge