merge of '3e9bce35baf6ce4cfadb07b45856fcd2cc535c3f'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 21:13:57 +0000 (21:13 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 7 Mar 2007 21:13:57 +0000 (21:13 +0000)
     and '5f1842dd64866505c065323f06cce3ba0ab5d638'


Trivial merge