merge of '4b0ecf8b99b73f1af0da8356e51642c2979ce27e'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 18 Mar 2007 00:54:28 +0000 (00:54 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 18 Mar 2007 00:54:28 +0000 (00:54 +0000)
     and '85d31d9cef302e8e998c83f837ea473786dc30af'


Trivial merge