merge of '079169fa4d08258d986a995133f464bd3d6b1447'
authorOyvind Repvik <nail@nslu2-linux.org>
Sat, 17 Mar 2007 21:40:31 +0000 (21:40 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Sat, 17 Mar 2007 21:40:31 +0000 (21:40 +0000)
     and '9ac358a36d17b24c57af9ffaaeed3e835fd8768a'


Trivial merge