merge of '45bb832d6d0ed21a2ec91685ceb9dd7f847010bd'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 3 Mar 2008 13:16:13 +0000 (13:16 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 3 Mar 2008 13:16:13 +0000 (13:16 +0000)
commitab757bb5e2efd0dadca310fc79891fb95833035e
tree91ae2eb41305f83b24aabb38d4a4268681be3f98
parent97dc4e52619da90ed223801527847b843e55c5cc
parentd7db9fd89a49a92f2fceab4ac24ee2f047ebe86b
Merge ... '45bb832d6d0ed21a2ec91685ceb9dd7f847010bd'
     and 'fbe4ca1964daebea4d7ba83733214f1cfa937b5b'