merge of '77568721a23fd5ed3dffb71400922d04d29dbc1c'
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 17 Mar 2007 01:29:38 +0000 (01:29 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sat, 17 Mar 2007 01:29:38 +0000 (01:29 +0000)
     and 'ac701fa4ef39ff7b0587edb2f4063c0b05096acd'


Trivial merge