| 
							
							
								 Marek Marczykowski | 3171cdbdcc | Merge branch 'master' into hvm Conflicts:
	dom0/qvm-core/qubes.py
	dom0/qvm-tools/qvm-create
	dom0/qvm-tools/qvm-prefs | 2012-03-09 11:34:13 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | cdd73f3d14 | dom0/core: drop support for non-updateable templates Implement 'updateable' property as 'template is None' | 2012-03-09 11:28:06 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | d7aed8b233 | dom0/core: API CHANGE: change 'template_vm' to 'template' Just to match property displayed everywhere, also simplifying tools like
qvm-prefs. | 2012-03-09 11:01:20 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | b4b639cbb3 | dom0/core: clone support for HVM | 2012-03-02 16:28:15 +01:00 |  | 
			
				
					| 
							
							
								 Marek Marczykowski | 5f87303b69 | dom0/core: rework of VM clone mechanism | 2012-03-02 16:06:26 +01:00 |  |