merge of 'a3a6b606f8696b6f5cbfbee341c9dd0a91033a49'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 9 Mar 2007 21:38:52 +0000 (21:38 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 9 Mar 2007 21:38:52 +0000 (21:38 +0000)
     and 'cc41b5c73fe6e7b86bf9d57e9eacc0a32e449782'


Trivial merge