merge of 23591ab9c5cec77ee5fa2447257a15baa7a8182d
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 11 Mar 2006 23:18:09 +0000 (23:18 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Sat, 11 Mar 2006 23:18:09 +0000 (23:18 +0000)
     and 53e14a99825447107bfefacf77e28b5718be54b8


Trivial merge