Merge branch 'master' into rotation
authorCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 27 Jul 2010 14:55:45 +0000 (16:55 +0200)
committerCarsten Kutzner <ckutzne@ckutzne.mpibpc.intern>
Tue, 27 Jul 2010 14:55:45 +0000 (16:55 +0200)

Trivial merge