merge of 7caf52c13ad07d23cad84c5570562fdd3fb0c581
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 08:04:57 +0000 (08:04 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 08:04:57 +0000 (08:04 +0000)
     and c725906f0e3558baed0a3b474b1ce24d43dad211


Trivial merge