Commit 6c3e0811d4b563902fc094ca9ed231a25445a848

Ran Benita 2012-07-14T15:14:44

Convert missed enum merge_mode variables Signed-off-by: Ran Benita <ran234@gmail.com>