merge of 'cd5daaff9a39b5a7cfdc8b51c1371e6f01530b64'
authorOyvind Repvik <nail@nslu2-linux.org>
Mon, 15 Jan 2007 16:56:14 +0000 (16:56 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Mon, 15 Jan 2007 16:56:14 +0000 (16:56 +0000)
     and 'de437286d494ecd4e5d51aaa8d8a07c9bbe318b5'


Trivial merge