merge of '93697b2e52ed50509b62f950722d2032051cbe72'
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 3 Mar 2007 18:49:31 +0000 (18:49 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sat, 3 Mar 2007 18:49:31 +0000 (18:49 +0000)
     and '9f92f0834987ae2539df85d39df958a57e026236'


Trivial merge