merge of 198b28bba87e8c42ab6041406faa358334417c02
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 14 Jan 2006 06:22:41 +0000 (06:22 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 14 Jan 2006 06:22:41 +0000 (06:22 +0000)
     and 3862f1af15047c5bdc27ca357df15bdd3b9d80c3


Trivial merge