merge of '48a764df77d365129ff1353e6c89bd2787a10485'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 13:26:37 +0000 (13:26 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 29 Oct 2006 13:26:37 +0000 (13:26 +0000)
     and 'ee13a485ec097c5eb2f6e8a232ad7edc49b5ad75'


Trivial merge