merge of 4cabc1f4514de7d06d191258f499a56e52e61d7b
authorJohn Bowler <jbowler@nslu2-linux.org>
Thu, 11 Aug 2005 20:40:30 +0000 (20:40 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 11 Aug 2005 20:40:30 +0000 (20:40 +0000)
     and 823a1ea1e6a9e49dbe87bcce981a7df8a03d518e


Trivial merge