merge of '8004ebe0d31a849b3faff027d1ef807246b029ed'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 17 Nov 2006 16:33:37 +0000 (16:33 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 17 Nov 2006 16:33:37 +0000 (16:33 +0000)
     and 'e104d077b009a60b79d4d9002547dd6eae504a71'


Trivial merge