merge of '5b2edcba43123478f091eb514f24eff2c8635c68'
authorOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:28:35 +0000 (16:28 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Fri, 30 Mar 2007 16:28:35 +0000 (16:28 +0000)
     and 'b744deb0b5dfbe71f24212b7326b921dbaa53b29'


Trivial merge