merge of '0c12cf6126a10bee7a37d44010488011cec33290'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 17:32:55 +0000 (17:32 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 17:32:55 +0000 (17:32 +0000)
     and 'f52433f8dadd3b7325c2976ace428e6d818efa9c'


Trivial merge