merge of '79d76f976ca74f71f538f5c81a1e25b14ffe43f6'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 11:03:41 +0000 (11:03 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 11:03:41 +0000 (11:03 +0000)
commit35ba94be70961fd3f916afdbf15d2a7c8304301d
treee95d03f5535ae5a54c59b36314f45dbac5c2a92b
parentda0fdb36c258ae30b4e727b096bc088daa0ffb79
parent1b11de10b43788532f124f3c0152f31932c19618
Merge ... '79d76f976ca74f71f538f5c81a1e25b14ffe43f6'
     and 'b9ffe3b2fa4c42424206977c6be342c1305c83e7'