merge of d2b50db8c3a2dfa93a56f34063e7e78182ac274c
authorJohn Bowler <jbowler@nslu2-linux.org>
Tue, 10 Jan 2006 01:10:55 +0000 (01:10 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 10 Jan 2006 01:10:55 +0000 (01:10 +0000)
     and ef11dd4e8067d9c4f020b6cd39b8556bab34dc7a


Trivial merge