Additional commit to fix #BUKKIT-24

src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java

@@ -203,8 +203,12 @@ public class CraftItemStack extends ItemStack {
             list.add(subtag);
         }
 
+        if (enchantments.isEmpty()) {
+            tag.remove("ench");
+        } else {
             tag.set("ench", list);
         }
+    }
 
     public net.minecraft.server.ItemStack getHandle() {
         return item;