merge of 'aa327bc6909e97c6358a09ecd6fca8e61ae204e7'
authorFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:28:15 +0000 (14:28 +0000)
committerFlorian Boor <florian.boor@kernelconcepts.de>
Thu, 24 Jan 2008 14:28:15 +0000 (14:28 +0000)
commit1ab72c6d2a7e4f56f3c55411189ab4992d64c29c
tree20c9206d643595d0e1646b7f07c71df28aa4a658
parent59c5c06d11e26e5435f8f0c2fd0902f1dece57dc
parent62d4698b651ec93b84dcb2f04fffdbd2b420f103
Merge ... 'aa327bc6909e97c6358a09ecd6fca8e61ae204e7'
     and 'c0a3e474625678b13727e12b833983f6e3389de1'