Merge commit 'upstream/2008.1+svn1657'
commit48f95e3bdb14e684372d244caa4436a9f7049e4e
authorChristoph Egger <christoph@h738515.serverkompetenz.net>
Mon, 5 Jan 2009 01:37:17 +0000 (5 02:37 +0100)
committerChristoph Egger <christoph@h738515.serverkompetenz.net>
Mon, 5 Jan 2009 01:37:17 +0000 (5 02:37 +0100)
tree72a3427b50016404bafab57c57a5bcc68a198a23
parent3e73c10c1fec467df6edb044e2a9a2f179860681
parent773554afe1ecda3dada5484afa759be4ef7f4ebe
Merge commit 'upstream/2008.1+svn1657'