Merge branch 'master' of git.tuebingen.mpg.de:libdai