merge of '01f61c60289e6d5d11ca99200e7cac4d1ad5f8fe'
authorOyvind Repvik <nail@nslu2-linux.org>
Tue, 13 Mar 2007 18:00:45 +0000 (18:00 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Tue, 13 Mar 2007 18:00:45 +0000 (18:00 +0000)
     and '50e88f321fa8581fb3e6e39b6449fa5bc250be8d'


Trivial merge