merge of 'b1c334170a435bd72300d5aa9313ae11e6f77adb'
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 7 Apr 2007 20:37:54 +0000 (20:37 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sat, 7 Apr 2007 20:37:54 +0000 (20:37 +0000)
     and 'e9ff260856d0c12099e73221885f9c7b5f02923e'


Trivial merge