merge of 'ecad2d6a0192a40606d0b6ee2164ef2e95cbd263'
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 15 Mar 2007 11:22:19 +0000 (11:22 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Thu, 15 Mar 2007 11:22:19 +0000 (11:22 +0000)
     and 'f0ac883131dac02c3bdb6f69f376ce628a575a95'


Trivial merge