merge of '1a8e31d2ffcaca539ade0baec8dbd6a927d9c466'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 8 Apr 2007 11:06:26 +0000 (11:06 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 8 Apr 2007 11:06:26 +0000 (11:06 +0000)
     and '7dbda2b624d08e5fc6f9dfea51525e3fe8b4196c'


Trivial merge