merge of '3a46b29cc934022c7df085ba522531c57df6de56'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 14:27:44 +0000 (14:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 14:27:44 +0000 (14:27 +0000)
commit062a789c90b2a8410d0aa896f45f615e70700653
tree65161175a15e0c8aeac85c618436354556593765
parent684e77b0e2f27b33eb7f7c64543ca04598101011
parent274dd1b578d179e70a1c9db6d6a9fc9db73ed2b7
Merge ... '3a46b29cc934022c7df085ba522531c57df6de56'
     and 'c3be7d35a09514cd7f28929bb60b9f7801d12c54'