merge of '08572570b3312090fa0da584f4b7b2272ac58cae'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:53:07 +0000 (16:53 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:53:07 +0000 (16:53 +0000)
commit88ebf69d40fad41b9a6bab4073cdb34960918dfa
tree31978e5b3fd8d95e4a3117071fe591841c85e2ae
parent5dcc8301f347b05837c88eb7a0d73acbd0900992
parent0d34dd4e5c2135f24cdf7533b96f05c87d93a843
Merge ... '08572570b3312090fa0da584f4b7b2272ac58cae'
     and '1054ca4965286d532ebc6789997a44625d410958'