merge of '506921540e40ca88349b613ff4f509a099c6b2a7'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 14 Mar 2007 01:25:16 +0000 (01:25 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 14 Mar 2007 01:25:16 +0000 (01:25 +0000)
     and '6b290ffb4e40297757218b75620f7c02f38890eb'


Trivial merge