merge of '8c849d9d0b9d729aa6955275e0b002c5fe5d6113'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 16 Mar 2007 00:09:21 +0000 (00:09 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 16 Mar 2007 00:09:21 +0000 (00:09 +0000)
     and 'a5d274603426b6aa3f4588098fa08ad8f8a95064'


Trivial merge