Fix mergeListOption. Add error support in mergeEnableOption. svn path=/nixpkgs/trunk/; revision=12522