merge of '4657aa1d7f504b72dd4d75e3ffc5a1067390a4d1'
authorOyvind Repvik <nail@nslu2-linux.org>
Sun, 18 Mar 2007 15:27:07 +0000 (15:27 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sun, 18 Mar 2007 15:27:07 +0000 (15:27 +0000)
     and '72025f26ef1ef6cd7b981232c1a7fb056193282c'


Trivial merge