merge of '1ed4ea88aa1659704dd7e9205023eaef7387f051'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 12:52:10 +0000 (12:52 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 12:52:10 +0000 (12:52 +0000)
     and '90400ad96343bd116689ed5d43b10e8bbf0b3577'


Trivial merge