[bdii: 21/25] Merge remote branch 'origin/f13/master'

[Mattias Ellert]

commit 910835f6156f2879faeafb92b4a20d7f68d97913
Merge: c8d096c a1e0eba
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Sep 2 13:08:57 2010 +0200

    Merge remote branch 'origin/f13/master'

---