merge of '33277e0b1c7ca0f6953d618e9606c2a3d9e112f3'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 17 Jan 2007 15:55:38 +0000 (15:55 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 17 Jan 2007 15:55:38 +0000 (15:55 +0000)
     and 'e6a146e5939a85de15f93abfd20e4ad3ab3a9e5c'


Trivial merge