Fix merging enumerated types problem described in http://www.mobileread.com/forums/showthread.php?t=245435
Fix merging of book records not working correctly for custom columns of type text with fixed set of permitted values. Null values were incorrectly overwriting non-null values.

Merge branch 'master' of https://github.com/cbhaley/calibre