merge of 972552ee20c9c9c79e01afea5f9276b5e4c554bd
authorJohn Bowler <jbowler@nslu2-linux.org>
Sun, 5 Feb 2006 06:10:45 +0000 (06:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sun, 5 Feb 2006 06:10:45 +0000 (06:10 +0000)
     and d17c8965045bca1d838e85c0b4579217b647682c


Trivial merge