merge of 'c5eea994991e4c7a48caf1a2468b26e9ed36ec96'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 12:52:17 +0000 (12:52 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 12:52:17 +0000 (12:52 +0000)
     and 'ce402fd3c19710d98b786f4def7ba00f2008d491'


Trivial merge