Merge branch 'file-magic'
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 26 May 2011 09:58:57 +0000 (11:58 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Thu, 26 May 2011 09:58:57 +0000 (11:58 +0200)

Trivial merge