merge of '7ebcf65940382b7ebea258189704cb0e4a77dc70'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 15:59:47 +0000 (15:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 29 Feb 2008 15:59:47 +0000 (15:59 +0000)
commitd8618d0ce0ee1bf7ad72efac9cbf5626a2897698
treefc29126a2695526378cef852bc57bf7b6d219df5
parent5a362b4bb805986fbb4a5e0aee08d23b62d84b05
parent5e33f4db5f153d6b3e3cc9c75523e9ce9288e396
Merge ... '7ebcf65940382b7ebea258189704cb0e4a77dc70'
     and 'ae9980c1d055e682beb2fea6cfddb080c495b43b'