merge of 'c9189cf531a6d542d7960e099d5ba157da963401'
authorMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:31:13 +0000 (08:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Wed, 24 Sep 2008 08:31:13 +0000 (08:31 +0000)
commit17d2b8a8282c911f3d394fac1d042912c1f7f0ee
tree63ab427787d2e7d4261cd7516019dcc542f82f25
parent61d03805ff40801fa069fda38547aff940fba287
parent1145a6c3868bcb4d17c7a3406de7da31dd89608c
Merge ... 'c9189cf531a6d542d7960e099d5ba157da963401'
     and 'cdf01a4ca20cb7c2ce18d070d85bd75bcb532cc7'