merge of '6973c76c103f69158263106e5945c463a17c9759'
authorMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 11:31:31 +0000 (11:31 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Sun, 27 Jul 2008 11:31:31 +0000 (11:31 +0000)
commit5813fca142ff995ed4e5c1c0e6d1d5f007fa7591
tree30b0f0baaeb8382a661107c4271418080580e12c
parent018d92634dff17f4a8744c2dd325bd5f83b074ad
parent950a8a787ebd715a4e5c27d05a797de36b6ce769
Merge ... '6973c76c103f69158263106e5945c463a17c9759'
     and 'd0ceb396a5b7e7e0d8d4512700c0f717f80ff7bc'