merge of '52333e2ff8a0a55bff7597d29b54ad3d0e836033'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Jan 2008 11:42:27 +0000 (11:42 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Fri, 25 Jan 2008 11:42:27 +0000 (11:42 +0000)
commit1e1f9cf27db4407081365f265a0e62ff71852696
treee9b6caacaf2203ac3324f3f74662574135540720
parent809c7ec119ba02d618fbe2026d162cd9bb9b054d
parentaf2e5dd7be815f61b1349c9855b7ca101c938b2d
Merge ... '52333e2ff8a0a55bff7597d29b54ad3d0e836033'
     and '7164da9fb8de274ee480409ef0b6ce02db5de39b'