merge of 0aba4d5c115b944af22e79b2d43f8d1848724fc2
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 2 Aug 2005 15:46:39 +0000 (15:46 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Tue, 2 Aug 2005 15:46:39 +0000 (15:46 +0000)
     and 1aebe30c46f7b39a3a73dcd30e1227c1a403f1bd


Trivial merge