merge of '1057a7dd4281b008df3336f70c20a7b782601402'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 16 Mar 2007 22:44:37 +0000 (22:44 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 16 Mar 2007 22:44:37 +0000 (22:44 +0000)
     and '8b5079938e203b33211ea242ae28706e1ab24ce8'


Trivial merge