merge of 'b41b2179eb6432d9e607dc4b3056424946bb8c66'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 15:27:58 +0000 (15:27 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 10 Oct 2008 15:27:58 +0000 (15:27 +0000)
commit9666d50a291f9c6ee91fdda5a219e32c8d623fc4
tree0e1cea70dd975d84f20b40e070941f6c51cb16ed
parentd0305f6d77ce364ee67d47c4b6ae1bb6c3fad6ac
parent22daad61fa11c387f78a1c6852bf8d812c835c88
Merge ... 'b41b2179eb6432d9e607dc4b3056424946bb8c66'
     and 'ee585ae1d7dbac814d0d2c450e80ef5eb5673366'