merge of 3a43238b0a602039ba26a7418ed911eaee3d4748
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 19 Jul 2005 22:29:02 +0000 (22:29 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 19 Jul 2005 22:29:02 +0000 (22:29 +0000)
     and 76ec428e36a1ce1f16ed827eb407369786c2a706


Trivial merge