Merge branch 'master' of git@git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 28 Jun 2010 12:15:10 +0000 (14:15 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 28 Jun 2010 12:15:10 +0000 (14:15 +0200)

Trivial merge