Fixed merge conflict.
authorFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:41:38 +0000 (09:41 +0200)
committerFrancois Fleuret <francois@fleuret.org>
Wed, 15 Apr 2009 07:41:38 +0000 (09:41 +0200)
commit4ef2de60f7e2e6bc351838a3b43c55df6577c191
tree747bde72ee3853b913ba9f66dd16ee276c51a706
parent6bfacc5594cad8647f454cc3aab15068663d7bbb
Fixed merge conflict.
REVISION_NUMBER