merge of 'a46fe2d26d8c7aac5482b90f8e004435a87e488b'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 4 Mar 2007 20:42:16 +0000 (20:42 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 4 Mar 2007 20:42:16 +0000 (20:42 +0000)
     and 'd48faafc2d6c701f69b6f3eb81394114da352744'


Trivial merge