merge of '33277e0b1c7ca0f6953d618e9606c2a3d9e112f3'
authorOyvind Repvik <nail@nslu2-linux.org>
Wed, 17 Jan 2007 15:55:38 +0000 (15:55 +0000)
committerOyvind Repvik <nail@nslu2-linux.org>
Wed, 17 Jan 2007 15:55:38 +0000 (15:55 +0000)
commit070f71e1d468e29882c8c2f42ed5f50c7fefa7ad
tree85749032210697fcf9289f48fb1a04bb828ad6a0
parent36ecaee66eeb977fd8031107286975a496504136
parentf3b5d4ff15231c4fea35f9c92e681c00832640c4
Merge ... '33277e0b1c7ca0f6953d618e9606c2a3d9e112f3'
     and 'e6a146e5939a85de15f93abfd20e4ad3ab3a9e5c'