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)
commit906baa70751285bc921c40e3ebe5964fbeac7bbf
treedf5890c60ba6eaa4f20140b76b54719074dad98e
parent78cfbc9c82c7acab44b6ba4d619f422760b9f03a
parent547d37e3dc0dd43dc86d45ab2490dc622b0c386d
Merge ... 'cd5daaff9a39b5a7cfdc8b51c1371e6f01530b64'
     and 'de437286d494ecd4e5d51aaa8d8a07c9bbe318b5'