Merge branch 'master' of git.tuebingen.mpg.de:libdai
authorJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 12 Apr 2010 20:13:29 +0000 (22:13 +0200)
committerJoris Mooij <joris.mooij@tuebingen.mpg.de>
Mon, 12 Apr 2010 20:13:29 +0000 (22:13 +0200)

Trivial merge