bzr push into mysql-5.5-cluster-7.2 branch (bjorn.munch:3774 to 3775)

[Bjorn Munch]

 3775 Bjorn Munch	2012-01-30
      Add missing @ in packaging/WiX/mysql_server.wxs.in

    modified:
      packaging/WiX/mysql_server.wxs.in
 3774 Bernd Ocklin	2012-01-30
      msi: fix upgrade code and package names

    modified:
      packaging/WiX/create_msi.cmake.in
      packaging/WiX/mysql_server.wxs.in
=== modified file 'packaging/WiX/mysql_server.wxs.in'
--- a/packaging/WiX/mysql_server.wxs.in	2012-01-30 12:11:00 +0000
+++ b/packaging/WiX/mysql_server.wxs.in	2012-01-30 17:32:30 +0000
@@ -20,7 +20,7 @@
 
   <Product 
     Id="*" 
-    UpgradeCode="@UPGRADE_CODE"
+    UpgradeCode="@UPGRADE_CODE@"
     Name="@PRODUCT_NAME@ @MAJOR_VERSION@.@MINOR_VERSION@" 
     Version="@MAJOR_VERSION@.@MINOR_VERSION@.@PATCH_VERSION@" 
     Language="1033" 

No bundle (reason: useless for push emails).