Merge remote-tracking branch 'mpi/master'
authorAndre Noll <maan@systemlinux.org>
Sun, 19 May 2013 21:05:00 +0000 (23:05 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 19 May 2013 21:05:00 +0000 (23:05 +0200)

Trivial merge