merge of '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 16:05:50 +0000 (16:05 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 27 Jun 2008 16:05:50 +0000 (16:05 +0000)
commit882473c9913cf09da1f8e89738cb859e1e8bd882
tree818e039de162dcbc73f7826c28687132055dc561
parent31c3d2f534c933df59abd3f594d177b781e549ba
parentf3b6b70f150b257afef3d025c1ed86b9270966b3
Merge ... '28c74aa25680384c6f311fd8f4123ddb27c1ba65'
     and '77f81ea18669b5c79145faa5f0a96df1d7db3232'