Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							539db08956 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6892 Create separate package for the mysql HA component  
						
						 
						
						
						
						
					 
					
						2014-07-04 14:37:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							4607c26949 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecies 6. Add run Service Checkbox 7. Add ReadMe checkbox"  
						
						 
						
						... 
						
						
						
						This reverts commit ce5061e107f743e52b23445fd97fcf60d8160ec6. 
						
						
					 
					
						2014-07-04 10:04:04 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							ce5061e107 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6834 : 3. Some description changes words like CloudStack etc 4. Change Default installation location if possible include version number 5. Mysql Connector Installer along with other dependecies 6. Add run Service Checkbox 7. Add ReadMe checkbox  
						
						 
						
						... 
						
						
						
						Signed-off-by: Koushik Das <koushik@apache.org> 
						
						
					 
					
						2014-07-03 17:43:00 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								seif 
							
						 
					 
					
						
						
						
						
							
						
						
							9a27f201b0 
							
						 
					 
					
						
						
							
							Enable primary storage to be added that is based on non-default storage plug-ins  
						
						 
						
						
						
						
					 
					
						2014-06-26 23:49:23 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Nitin Mehta 
							
						 
					 
					
						
						
						
						
							
						
						
							80ef915fd5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7000: ListSnapshotPolicy should list by policyid. Introduce updateSnapshotPolicy command  
						
						 
						
						... 
						
						
						
						(cherry picked from commit fce21439facea267d958d8939059ba65afb3578a) 
						
						
					 
					
						2014-06-26 11:38:41 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							d781824aa9 
							
						 
					 
					
						
						
							
							These should have been gone a long time ago  
						
						 
						
						
						
						
					 
					
						2014-06-25 15:51:28 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Daan Hoogland 
							
						 
					 
					
						
						
						
						
							
						
						
							c79ab570b0 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6967: Initial OVM3 drop"  
						
						 
						
						... 
						
						
						
						This reverts commit 8a485b9b59e4108e862022baf7477f768380b325. 
						
						
					 
					
						2014-06-24 10:24:01 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Funs 
							
						 
					 
					
						
						
						
						
							
						
						
							8a485b9b59 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6967: Initial OVM3 drop  
						
						 
						
						... 
						
						
						
						Signed-off-by: Sebastien Goasguen <runseb@gmail.com>
(cherry picked from commit ed47763e2525a21fa4578d199492462d0fb1c7ef)
Conflicts:
	api/src/com/cloud/network/NetworkService.java
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java
	plugins/pom.xml
	server/src/com/cloud/network/NetworkServiceImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
	ui/scripts/docs.js 
						
						
					 
					
						2014-06-23 12:39:10 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Upendra Moturi 
							
						 
					 
					
						
						
						
						
							
						
						
							918c320438 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value  
						
						 
						
						
						
						
					 
					
						2014-06-20 12:07:50 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							8b85bf9c27 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch (with 4.4 translation strings)  
						
						 
						
						
						
						
					 
					
						2014-06-12 08:03:39 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							9855a84a18 
							
						 
					 
					
						
						
							
							Move the maven wiz stuff to the tools directory and make sure it gets build with the correct version when needed  
						
						 
						
						
						
						
					 
					
						2014-06-11 14:06:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Tim Mackey 
							
						 
					 
					
						
						
						
						
							
						
						
							a8212d9ef4 
							
						 
					 
					
						
						
							
							Cleanup of Xen and XenServer terms. Cloned xen plugin creating a xenserver plugin, then removed xen plugin  
						
						 
						
						... 
						
						
						
						Signed-off-by: Tim Mackey <tmackey@gmail.com>
Signed-off-by: Sebastien Goasguen <runseb@gmail.com> 
						
						
					 
					
						2014-06-07 04:50:23 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							603eab751a 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6701, CLOUDSTACK-6702:  
						
						 
						
						... 
						
						
						
						1. Integrate System Seed Template into MSI Installer
2. Added progress bar status messages for custom actions at needed places.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-06-04 12:23:33 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							8a210b50fb 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6702: Move all titles and descriptions to a property file or move to build properties  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-05-28 16:10:42 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							8f98cc304e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6700 : Give Option to install or not MySql Server along with Main Installer on the same server.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-05-23 16:25:38 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							ba848087f8 
							
						 
					 
					
						
						
							
							Disable IAM feature from 4.4 release.  
						
						 
						
						
						
						
					 
					
						2014-05-22 18:27:08 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							61c765b230 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6563: Integrating setuptools for python into MSI  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-05-20 14:57:44 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							aca7606a40 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6563: Integrating dependencies as part of MSI installer so that those will get installed along with cloud stack installation  
						
						 
						
						
						
						
					 
					
						2014-05-16 10:50:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							961e2c43bc 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6659: fixed the name for the updateIpAddress API command  
						
						 
						
						
						
						
					 
					
						2014-05-14 12:34:36 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							7ae8dc8fbd 
							
						 
					 
					
						
						
							
							Revert "CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs"  
						
						 
						
						... 
						
						
						
						This reverts commit 348fb7bcb675f60d1a3c649a8c0af8404044642f. 
						
						
					 
					
						2014-05-12 12:26:37 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							348fb7bcb6 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6565: [UI] New Zones tab for Templates and ISOs  
						
						 
						
						
						
						
					 
					
						2014-05-12 11:40:24 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alena Prokharchyk 
							
						 
					 
					
						
						
						
						
							
						
						
							66d5ebc657 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6596: UUID and display flag update support for LBStickinessPolicy and LBHealthCheckPolicy  
						
						 
						
						
						
						
					 
					
						2014-05-07 15:46:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							1080de5d6d 
							
						 
					 
					
						
						
							
							Remove bad backslash near "label.nicira.nvp.details" key.  
						
						 
						
						
						
						
					 
					
						2014-05-04 15:32:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Milamber 
							
						 
					 
					
						
						
						
						
							
						
						
							90245ebe85 
							
						 
					 
					
						
						
							
							Update L10N resource files on master branch (with 4.4 translation strings)  
						
						 
						
						
						
						
					 
					
						2014-05-04 15:26:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							29b4fe6d9f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6271: The cloud-setup-databases was failing when your jasypt jar path has spaces in it's path  
						
						 
						
						
						
						
					 
					
						2014-04-29 14:44:03 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Laszlo Hornyak 
							
						 
					 
					
						
						
						
						
							
						
						
							fc68922286 
							
						 
					 
					
						
						
							
							Static resource compression  
						
						 
						
						... 
						
						
						
						- added compile time maven plugin to compress css and js files
- Added new StaticResourceServlet to serve the requests to static files, this replaces the tomcat DefaultServlet
- Tests
- mapping of the static resource servlet to css and js files
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-04-28 21:10:18 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							881792991e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6271:[Windows] Integrating setup databases with msi installer for windows  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-04-28 16:46:26 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							156b08af5f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6255  
						
						 
						
						... 
						
						
						
						UI for supporting region level VPC, distributed routing enabled VPC and
stretched L2 neworks 
						
						
					 
					
						2014-04-24 15:05:59 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Koushik Das 
							
						 
					 
					
						
						
						
						
							
						
						
							b088821c61 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6445: Simulator enhancements  
						
						 
						
						... 
						
						
						
						Refer FS - https://cwiki.apache.org/confluence/display/CLOUDSTACK/Simulator+enhancements  
						
						
					 
					
						2014-04-18 16:44:21 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							f3cf85bb62 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6233: Add new tab "GPU" in Host detailView for gpu enabled hosts  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
Signed-off-by: Sanjay Tripathi <sanjay.tripathi@citrix.com> 
						
						
					 
					
						2014-04-16 16:09:41 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar Reddy 
							
						 
					 
					
						
						
						
						
							
						
						
							54d3a3dc90 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6410 : Maven Integration for windows Wix tool to create msi installer thropugh maven build process  
						
						 
						
						... 
						
						
						
						Signed-off-by: Abhinandan Prateek <aprateek@apache.org> 
						
						
					 
					
						2014-04-16 11:07:10 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							e35bec515f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6342: UI changes for secondary IP on LB rules  
						
						 
						
						... 
						
						
						
						This is front-end only; API call changes still need to be done. 
						
						
					 
					
						2014-04-15 14:42:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							11f5bdd78d 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6191 Add support for specifying volume provisioning  
						
						 
						
						... 
						
						
						
						type (thin, sparse, fat) in disk/compute offerings.
Submitted-by: Yoshikazu Nojima <mail@ynojima.net>
Reviewed-by: Marcus Sorensen, Mike Tutowski 
						
						
					 
					
						2014-04-10 09:23:04 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mike Tutkowski 
							
						 
					 
					
						
						
						
						
							
						
						
							5e3d4aebac 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6273 (Text changed slightly for a confirmation dialog)  
						
						 
						
						
						
						
					 
					
						2014-03-21 19:12:41 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Brian Federle 
							
						 
					 
					
						
						
						
						
							
						
						
							15729f342c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6272: Fix recover/restore VM actions  
						
						 
						
						... 
						
						
						
						-Label recoverVirtualMachine as 'Recover VM'
-Label restoreVirtualMachine as 'Reinstall VM'
-Change confirmation text for restoreVirtualMachine to be more explicit
-Change restoreVirtualMachine icon to 'recycle' symbol, to avoid
 confusion with the reboot VM icon 
						
						
					 
					
						2014-03-21 13:28:52 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								punith-cloudbyte 
							
						 
					 
					
						
						
						
						
							
						
						
							f3c7c607bd 
							
						 
					 
					
						
						
							
							cloudbyte storage plugin for master commit  
						
						 
						
						
						
						
					 
					
						2014-03-18 11:14:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Jessica Wang 
							
						 
					 
					
						
						
						
						
							
						
						
							dadaf85860 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6246: UI > Infrastructure > SSL Certificate > update (1) mouse-over hint of SSL Certificate button. (2) description in SSL Certificate dialog.  
						
						 
						
						
						
						
					 
					
						2014-03-17 15:41:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							4402685e11 
							
						 
					 
					
						
						
							
							Update master to 4.5.0-SNAPSHOT  
						
						 
						
						
						
						
					 
					
						2014-03-14 14:55:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prachi Damle 
							
						 
					 
					
						
						
						
						
							
						
						
							fa80c63c33 
							
						 
					 
					
						
						
							
							Removing the copy task that is not needed any more.  
						
						 
						
						... 
						
						
						
						We do not need to copy commands.properties to utils anymore since the IAM permissions are no longer loaded during Upgrade 
						
						
					 
					
						2014-03-13 14:14:12 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							99bdc8d875 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-03-13 11:05:03 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								amogh.vasekar 
							
						 
					 
					
						
						
						
						
							
						
						
							3ee1fc28de 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6217:  
						
						 
						
						... 
						
						
						
						Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same
Signed off by: Nitin Mehta <nitin.mehta@citrix.com> 
						
						
					 
					
						2014-03-12 17:03:38 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Mihaela Stoica 
							
						 
					 
					
						
						
						
						
							
						
						
							36558e4619 
							
						 
					 
					
						
						
							
							Corrected the value of label.no.grouping in the resource files. An extra backspace at the end of the string caused incorrect text to be shown in the Select view dropdown on Virtual Routers page: "(no grouping)\label.create.nfs.secondary.staging.storage=Create NFS Secondary Staging Store" instead of "(no grouping)"  
						
						 
						
						... 
						
						
						
						Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com> 
						
						
					 
					
						2014-03-11 11:25:18 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							48e08fe676 
							
						 
					 
					
						
						
							
							Merge branch 'master' into rbac.  
						
						 
						
						
						
						
					 
					
						2014-03-06 14:02:20 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								vetrivelc 
							
						 
					 
					
						
						
						
						
							
						
						
							182c31899b 
							
						 
					 
					
						
						
							
							Externalized the hardcodedstrings from UI JAVASCRIPT files.  
						
						 
						
						
						
						
					 
					
						2014-03-05 14:11:51 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Gabor Apati-Nagy 
							
						 
					 
					
						
						
						
						
							
						
						
							477902379e 
							
						 
					 
					
						
						
							
							Fix CLOUDSTACK-4563: Initial zone wizard UI label issue  
						
						 
						
						
						
						
					 
					
						2014-03-03 10:19:03 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							3beb75cdf1 
							
						 
					 
					
						
						
							
							Fix typo  
						
						 
						
						
						
						
					 
					
						2014-02-27 12:59:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							a0f932437c 
							
						 
					 
					
						
						
							
							Move mysql ha strategy to a plugin. Activate this plugin using the mysqlha profile or the noredist flag  
						
						 
						
						
						
						
					 
					
						2014-02-27 09:51:02 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Min Chen 
							
						 
					 
					
						
						
						
						
							
						
						
							9f47466fea 
							
						 
					 
					
						
						
							
							Fix some issues in renaming iam api, also fix marvin library.  
						
						 
						
						
						
						
					 
					
						2014-02-26 17:30:34 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Konstantina Chremmou 
							
						 
					 
					
						
						
						
						
							
						
						
							f05fb9fb61 
							
						 
					 
					
						
						
							
							Fixed some resource files issues, namely 1) invalid text and duplicate keys resulting from bad merge and 2) trailing spaces which can potentially cause UI issues.  
						
						 
						
						... 
						
						
						
						Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>
Reviewed-by: Laszlo Hornyak <laszlo.hornyak@gmail.com> 
						
						
					 
					
						2014-02-25 22:05:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							afc188cb5c 
							
						 
					 
					
						
						
							
							Forward port the fix by David from 0c2ad0338e34f6117cecc24ec00c7746dd481465  
						
						 
						
						
						
						
					 
					
						2014-02-25 15:18:16 +01:00