merge of 'b74bbaef312bef5b91193f9733ecea39b3427e18'
authorMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 19:44:33 +0000 (19:44 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Mon, 25 Aug 2008 19:44:33 +0000 (19:44 +0000)
commit45ff426346539ef0fc64ff8ce1d62991d9f89549
treeac7314e159b68b54049595ce83f9dbba1af725cd
parentcf7c3e4b4071b5fd1b2a2db1d29552802419c9aa
parent393416f90d61c3d6ebadc1a715eaeaac2f5573d1
Merge ... 'b74bbaef312bef5b91193f9733ecea39b3427e18'
     and 'd800abb6a82b493cb7014046a6c4a2db09d3b5e4'