merge of '9b590c455ec18081740ff67b970076675bf4220c'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 9 Mar 2007 21:41:32 +0000 (21:41 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 9 Mar 2007 21:41:32 +0000 (21:41 +0000)
     and 'd02e88de133625c48c0dfeb0ebe1c942b3bb7dcf'


Trivial merge