Merge branch 'vendor/MDOCML'
authorSascha Wildner <saw@online.de>
Sat, 9 Apr 2011 21:56:26 +0000 (23:56 +0200)
committerSascha Wildner <saw@online.de>
Sat, 9 Apr 2011 21:56:26 +0000 (23:56 +0200)

Trivial merge