merge of 45134ada52bf69aa376e98002657a0c130e6ff44
authorJohn Bowler <jbowler@nslu2-linux.org>
Mon, 9 Jan 2006 19:23:03 +0000 (19:23 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Mon, 9 Jan 2006 19:23:03 +0000 (19:23 +0000)
     and 77ee5dc366bb987ffa1f3267250d243a17292002


Trivial merge