merge of '10a72379978544c320bfaad3d3cb9cbe757a340f'
authorOyvind Repvik <nail@nslu2-linux.org>
Thu, 15 Mar 2007 21:28:59 +0000 (21:28 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Thu, 15 Mar 2007 21:28:59 +0000 (21:28 +0000)
     and '9bf3bcdd2e511bc4a43982cfe24758ace2880f0b'


Trivial merge