merge of '8d70e5add933e64d98b3889ca206ef3aa7d92c67'
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 7 Apr 2007 20:49:30 +0000 (20:49 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sat, 7 Apr 2007 20:49:30 +0000 (20:49 +0000)
     and 'ee70175ed0a22d4d4bf77de0cc63ee155b413834'


Trivial merge