Fix merge artifact

svn path=/branches/cmake-bringup/; revision=50666
This commit is contained in:
Timo Kreuzer 2011-02-12 10:46:17 +00:00
parent 33533af643
commit 44366c9fd0