[R-qtl: 34/37] Merge remote branch 'origin/el6/master'

[Mattias Ellert]

commit 98206e96367a2316022d08b12f9cfa1343572b63
Merge: 5391256 4821be7
Author: Mattias Ellert <mattias.ellert at fysast.uu.se>
Date:   Thu Sep 2 09:34:57 2010 +0200

    Merge remote branch 'origin/el6/master'

---