merge of 'a9e6f94b65227e58f5c546973c24a3202e0059a6'
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 1 Mar 2007 10:01:33 +0000 (10:01 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Thu, 1 Mar 2007 10:01:33 +0000 (10:01 +0000)
     and 'c405009477f47b2362e45a8a3283471611ce9f3e'


Trivial merge