merge of '3d16fc990b4d6c80f2bcc61c2c91f1e48be35123'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 11 Mar 2007 20:49:50 +0000 (20:49 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 11 Mar 2007 20:49:50 +0000 (20:49 +0000)
     and '794c9bc6688e14db2005eb3dd1743fc853634339'


Trivial merge