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

Conflicts:
	include/dai/doc.h

diff --cc include/dai/alldai.h
Simple merge

diff --cc include/dai/doc.h
index 44dcf90,9ce94ea..127359f
--- 1/include/dai/doc.h
--- 2/include/dai/doc.h
+++ b/include/dai/doc.h
@@@ -669,15 -670,9 +688,20 @@@
   *  \anchor KFL01 \ref KFL01
   *  F. R. Kschischang and B. J. Frey and H.-A. Loeliger (2001):
   *  "Factor Graphs and the Sum-Product Algorithm",
 - *  <em>IEEE Transactions on Information Theory</em> 47(2):498-519.
 + *  <em>IEEE Transactions on Information Theory</em> 47(2):498-519,
   *  http://ieeexplore.ieee.org/xpl/freeabs_all.jsp?arnumber=910572
   *
++ *  \anchor KoF09 \ref KoF09
++ *  D. Koller and N. Friedman (2009):
++ *  <em>Probabilistic Graphical Models - Principles and Techniques</em>,
++ *  The MIT Press, Cambridge, Massachusetts, London, England.
++
 + *  \anchor Min05 \ref Min05
 + *  T. Minka (2005):
 + *  "Divergence measures and message passing",
 + *  <em>MicroSoft Research Technical Report</em> MSR-TR-2005-173,
 + *  http://research.microsoft.com/en-us/um/people/minka/papers/message-passing/minka-divergence.pdf
 + *
   *  \anchor MiQ04 \ref MiQ04
   *  T. Minka and Y. Qi (2004):
   *  "Tree-structured Approximations by Expectation Propagation",

diff --cc src/alldai.cpp
Simple merge