merge of '000f3043f3bc342f7e9f0ae01f68a648ca77b403'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:59:59 +0000 (14:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 8 Feb 2008 14:59:59 +0000 (14:59 +0000)
commitd3740f299c896999d0e80b62c15960e7ee9efc0c
tree20bb4d4ad34d48048e8d8ca3ab571b2a36db31c4
parenta2edc3a63fc0f5155ce9028991c12a8a2d034c63
parentb0ffb892dbdd777f71dffc0e60f4d7188a777895
Merge ... '000f3043f3bc342f7e9f0ae01f68a648ca77b403'
     and 'da9d34bcc42bfafdd2c02e04160e8a8334a3267f'