merge of 'adb71bd42c308e5f50a18441883b2051173f9cd2'
authorMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 06:59:15 +0000 (06:59 +0000)
committerMichael Lauer <mickey@vanille-media.de>
Fri, 13 Jun 2008 06:59:15 +0000 (06:59 +0000)
commitec6d55d9cff77c7626ae65a9a8307f046435973a
treecf2db2645fa419683a05ed5e78d4b62b2cfa9d0f
parentbc75bdf1d5ebcd011aba473449cd444d55906a5b
parentec73e0ba3910754256586703930355a4840e86a8
Merge ... 'adb71bd42c308e5f50a18441883b2051173f9cd2'
     and 'd9f9c0225f99c1f7688e60a3a0c39a308c5fc36f'