merge of '0270b21f4232918698d67a29bd5af4e6e9eb84db'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 14 Mar 2007 17:21:52 +0000 (17:21 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 14 Mar 2007 17:21:52 +0000 (17:21 +0000)
     and '0f247ea6c8acb9078a5a74328d06651d79510b96'


Trivial merge