merge of '851b7587e1fa45e2c94b76c9b276389109102904'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 21 Mar 2007 13:39:49 +0000 (13:39 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 21 Mar 2007 13:39:49 +0000 (13:39 +0000)
     and 'd8b2a4bd8d91437fd8910dbfcd96ea93798e97d2'


Trivial merge