Damodar 
							
						 
					 
					
						
						
						
						
							
						
						
							7bea2f7098 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7671: Management server restart failed after reboot  
						
						 
						
						... 
						
						
						
						(cherry picked from commit e8f1c592120707ac214d535a6637fa7dc5826289) 
						
						
					 
					
						2014-10-13 00:30:41 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar 
							
						 
					 
					
						
						
						
						
							
						
						
							51e0488e5c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7316: Usage Server is not getting started when we install it on management server. This is happening when encryption is enabled. For usage server it is not able to get key file in the classpath.  
						
						 
						
						
						
						
					 
					
						2014-09-02 15:13:45 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Damodar 
							
						 
					 
					
						
						
						
						
							
						
						
							7ea7deded0 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7106 : RPM build failing with RHEL7 Reviewed By : Rayees  
						
						 
						
						... 
						
						
						
						Signed-off-by: Santhosh Edukulla <santhosh.edukulla@gmail.com> 
						
						
					 
					
						2014-08-26 11:04:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rohit Yadav 
							
						 
					 
					
						
						
						
						
							
						
						
							28ad34e31e 
							
						 
					 
					
						
						
							
							CLOUDSTACK-7038: Add mysql client dependency for mgmt server, rpms and debs  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 6a26e77514b955e5c9cbb00e51183ec74d3887a3)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com> 
						
						
					 
					
						2014-08-20 12:17:34 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Frank.Zhang 
							
						 
					 
					
						
						
						
						
							
						
						
							a0f1012903 
							
						 
					 
					
						
						
							
							CloudStackCLOUDSTACK-7366  
						
						 
						
						... 
						
						
						
						Baremetal agent is not including in RPM spec file 
						
						
					 
					
						2014-08-18 11:23:46 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							539db08956 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6892 Create separate package for the mysql HA component  
						
						 
						
						
						
						
					 
					
						2014-07-04 14:37:07 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Bierce 
							
						 
					 
					
						
						
						
						
							
						
						
							59eed9ef77 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6552 Cloudstack-Management install package creates log  
						
						 
						
						... 
						
						
						
						directory that is never used 
						
						
					 
					
						2014-05-06 11:24:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ynojima 
							
						 
					 
					
						
						
						
						
							
						
						
							155745e26c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-6351 bugfix: Java1.6 is installed instead of Java7  
						
						 
						
						... 
						
						
						
						Since epoch spesicifation doesn't work on RHEL6.3,
"java7" is used in the rpm spec.
Conflicts:
	packaging/centos63/cloud.spec 
						
						
					 
					
						2014-05-02 00:21:24 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rajesh Battala 
							
						 
					 
					
						
						
						
						
							
						
						
							4bc9f74b2d 
							
						 
					 
					
						
						
							
							Removed Epoch tag/number from the cloud.spec to fix the rpm installation of Management Server, Agent and awsapi  
						
						 
						
						
						
						
					 
					
						2014-04-29 17:14:49 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ynojima 
							
						 
					 
					
						
						
						
						
							
						
						
							098ad53c23 
							
						 
					 
					
						
						
							
							Bugfix: java6 is installed instead of java7 by yum dependancy resolution.  
						
						 
						
						
						
						
					 
					
						2014-04-18 22:53:17 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							49a29ce0cf 
							
						 
					 
					
						
						
							
							Switch to Java 7  
						
						 
						
						... 
						
						
						
						We now require at least Java 7 to build and run CloudStack.
Both the DEB and RPM packaging now also require Java 7 during installation
of the packages. 
						
						
					 
					
						2014-01-27 11:54:43 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Alex Hitchins 
							
						 
					 
					
						
						
						
						
							
						
						
							a9c25dcfa3 
							
						 
					 
					
						
						
							
							Added required dependancy to agent setup.  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 78f62c63479a81383ff8957a12c88ee4c181cfda)
Signed-off-by: David Nalley <david@gnsa.us> 
						
						
					 
					
						2014-01-22 12:24:52 -05:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							0d24d323c0 
							
						 
					 
					
						
						
							
							Fix for defect CLOUDSTACK-5053, QEMU should be installed in KVM agent hosts  
						
						 
						
						
						
						
					 
					
						2014-01-10 14:03:17 -08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							eb4c52ebca 
							
						 
					 
					
						
						
							
							Remove cloudmanagementserver.keystore from installation  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 38559223780fa0471f9b497102c3c727ae47382f) 
						
						
					 
					
						2013-11-11 18:11:06 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							57ba367f3c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-5042: change cloud.keystore to cloudmanagementserver.keystore and install it (cherry picked from commit de448ec4792eda5b47d79b26e9cb8ce96a2b22f4)  
						
						 
						
						
						
						
					 
					
						2013-11-08 09:00:29 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							e3280bdba2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/spring-modularization'  
						
						 
						
						... 
						
						
						
						Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
						
						
					 
					
						2013-10-23 11:14:42 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kishan Kavala 
							
						 
					 
					
						
						
						
						
							
						
						
							294b0c7277 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4921 : Add usage service to chkconfig  
						
						 
						
						
						
						
					 
					
						2013-10-23 16:05:12 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							c5c5e2367e 
							
						 
					 
					
						
						
							
							follow up fix for CLOUDSTACK-1049  
						
						 
						
						
						
						
					 
					
						2013-10-22 15:29:15 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Darren Shepherd 
							
						 
					 
					
						
						
						
						
							
						
						
							8cf00de51d 
							
						 
					 
					
						
						
							
							Configuration to enable Spring Modularization  
						
						 
						
						... 
						
						
						
						All of the code changes for the Spring Modularization will work in
a modularized context or a non-modularized context.  This commit
is the final commit to turn modularization on.  Revert this commit
to disable the modularization and go back to monolithic Spring
configuration. 
						
						
					 
					
						2013-10-02 15:43:11 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wido den Hollander 
							
						 
					 
					
						
						
						
						
							
						
						
							e6fd794ca0 
							
						 
					 
					
						
						
							
							packaging: Do not depend on JNA and don't include it in the classpath  
						
						 
						
						... 
						
						
						
						It's now packaged with maven due to libvirt 0.5.1 and will be included
in the classpath automatically. 
						
						
					 
					
						2013-09-29 12:22:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								ynojima 
							
						 
					 
					
						
						
						
						
							
						
						
							daec10e37a 
							
						 
					 
					
						
						
							
							fix rpm/deb build error caused by moving systemvm to its own maven project  
						
						 
						
						
						
						
					 
					
						2013-09-24 10:51:01 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							164e3e33b4 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4405: change rpm and debian packaging to support automatic update (KVM upgrade)  
						
						 
						
						... 
						
						
						
						Including following steps:
b. Run "cloudstack-agent-upgrade". This script will upgrade all the existing bridge name to new bridge name, and update related firewall rules.
c. install a libvirt hook:
    c1. mkdir /etc/libvirt/hooks
    c2. cp /usr/share/cloudstack-agent/lib/libvirtqemuhook /etc/libvirt/hooks/qemu
    c3. chmod +x /etc/libvirt/hooks/qemu
    c4. service libvirtd restart
(cherry picked from commit a0988780ad88bb56becb0a13efedcd79c1bee142)
Signed-off-by: Wei Zhou <w.zhou@leaseweb.com> 
						
						
					 
					
						2013-09-24 09:55:35 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							e325fb66ab 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4405: fix vm migration during the upgrade to 4.2  
						
						 
						
						... 
						
						
						
						Signed-off-by: Wei Zhou <w.zhou@leaseweb.com> 
						
						
					 
					
						2013-09-24 09:53:55 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Edison Su 
							
						 
					 
					
						
						
						
						
							
						
						
							7b4f846220 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4405: add a tool: cloudstack-agent-upgrade to upgrade bridge name on kvm host  
						
						 
						
						... 
						
						
						
						(cherry picked from commit 0ef6084d2c838a78eda29d258b1af98df96451b3)
Signed-off-by: Wei Zhou <w.zhou@leaseweb.com> 
						
						
					 
					
						2013-09-24 09:53:05 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							da99f6552c 
							
						 
					 
					
						
						
							
							Fix the spec file for the noredist build  
						
						 
						
						
						
						
					 
					
						2013-09-21 14:42:31 +08:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							fa26eaafbd 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4509 : management cache folder need to cleanup before upgrade, currently its cleaning up only for 3.x upgrade ie /var/cache/cloud, it should do that same for 4.2 also /var/cache/cloudstack  
						
						 
						
						
						
						
					 
					
						2013-08-28 11:23:22 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							c09bbd316c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4370 - Upgrade failing due to depenency with cloudstack-agent, changed remove dependency from cloud-agent to cloud-common  
						
						 
						
						
						
						
					 
					
						2013-08-19 15:13:23 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							d1b4a8d98c 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4149  
						
						 
						
						... 
						
						
						
						[upgrade][2.2.13 -> 2.2.14 -> 4.2][KVM] When we try to upgrade the KVM agent from 2.2.14 to 4.2 using the "U" option in install.sh script, management server also gets installed! 
						
						
					 
					
						2013-08-12 14:52:28 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								frank 
							
						 
					 
					
						
						
						
						
							
						
						
							35ab598d1f 
							
						 
					 
					
						
						
							
							CLOUDSTACK-4149  
						
						 
						
						... 
						
						
						
						[upgrade][2.2.13 -> 2.2.14 -> 4.2][KVM] When we try to upgrade the KVM agent from 2.2.14 to 4.2 using the "U" option in install.sh script, management server also gets installed! 
						
						
					 
					
						2013-08-12 12:11:25 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							e80fdcda94 
							
						 
					 
					
						
						
							
							Fix for CLOUDSTACK-3858, 2.2.14 does not contions symbolic link to create sever.xml, we need to check both file or symbolic link exist or not in save folder  
						
						 
						
						
						
						
					 
					
						2013-08-09 17:02:14 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							a49da6bee8 
							
						 
					 
					
						
						
							
							Supporting packaging for RHEL 5 and 6.2; updated macros  
						
						 
						
						... 
						
						
						
						Signed-off-by: Edison Su <sudison@gmail.com> 
						
						
					 
					
						2013-07-29 13:37:31 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							a5d17c8dc7 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2133 - Cisco VNMC xml need copy to plugins/network-elements/cisco-vnmc/scripts/network/cisco during installation  
						
						 
						
						
						
						
					 
					
						2013-07-29 11:50:48 -07:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rene Diepstraten 
							
						 
					 
					
						
						
						
						
							
						
						
							211b180d55 
							
						 
					 
					
						
						
							
							Replaced virsh() by python-libvirt functions  
						
						 
						
						... 
						
						
						
						Signed-off-by: Rene Diepstraten <rene@renediepstraten.nl> 
						
						
					 
					
						2013-07-25 18:10:58 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Wei Zhou 
							
						 
					 
					
						
						
						
						
							
						
						
							47b9e8ae61 
							
						 
					 
					
						
						
							
							add iptables/ethtool/vconfig requirement on Agent in cloud.spec  
						
						 
						
						
						
						
					 
					
						2013-07-18 09:29:26 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							db74b2a047 
							
						 
					 
					
						
						
							
							adding some more groups to cli and awsapi packages - no idea why I missed those earlier.  
						
						 
						
						
						
						
					 
					
						2013-07-14 15:00:25 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								David Nalley 
							
						 
					 
					
						
						
						
						
							
						
						
							7b3fef57fb 
							
						 
					 
					
						
						
							
							Adding a group to usage in spec file for RPM  
						
						 
						
						
						
						
					 
					
						2013-07-14 14:32:40 -04:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							3e7cebee29 
							
						 
					 
					
						
						
							
							Followup fix for CLOUDSTACK-2777, crypto.properties and xes.keystore moved to AWSAPI installation location and changed permission to 666  
						
						 
						
						
						
						
					 
					
						2013-07-09 21:07:32 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rayeesn 
							
						 
					 
					
						
						
						
						
							
						
						
							b4f6b57ef5 
							
						 
					 
					
						
						
							
							Adding axis2.xml to cloudstack-bridge/webapps/awsapi/WEB-INF/conf as part of defect CLOUDSTACK-2927  
						
						 
						
						
						
						
					 
					
						2013-07-01 11:43:09 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hiroaki KAWAI 
							
						 
					 
					
						
						
						
						
							
						
						
							78196384ae 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2758: touch file for tomcat6 package change CVS 2013-1976  
						
						 
						
						... 
						
						
						
						catalina.out must be prepared by package installation.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-06-05 17:00:47 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Prasanna Santhanam 
							
						 
					 
					
						
						
						
						
							
						
						
							55db2fe6d1 
							
						 
					 
					
						
						
							
							mvn clean does not do a complete clean  
						
						 
						
						... 
						
						
						
						Retains the systevm.iso from the previous run causing systemvm.iso to
never update itself. Do a complete clean install for all profiles
specified in mvn.
Signed-off-by: Prasanna Santhanam <tsp@apache.org> 
						
						
					 
					
						2013-06-03 14:29:48 +05:30  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcus Sorensen 
							
						 
					 
					
						
						
						
						
							
						
						
							800cd391d5 
							
						 
					 
					
						
						
							
							RPM build - run mvn clean before building packages, to get a build from fresh  
						
						 
						
						... 
						
						
						
						source
Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1369936033 -0600 
						
						
					 
					
						2013-05-30 16:13:40 -06:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							37ca43684b 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2440 Print a warning if the rpm can't determine the previous configuration for server.xml or tomcat.conf  
						
						 
						
						
						
						
					 
					
						2013-05-14 11:05:04 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							c2118180d5 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2440 RedHat (CentOS) expects a directory with the name of the service to store initd.log  
						
						 
						
						
						
						
					 
					
						2013-05-13 16:07:46 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							574e716352 
							
						 
					 
					
						
						
							
							CLOUDSTACK-2033 Fix usage server startup and logging  
						
						 
						
						... 
						
						
						
						Properly implement the Daemon interface
Initialize logging when the usage server is started as a daemon
Fix a few minor startup and packaging items. 
						
						
					 
					
						2013-04-16 10:52:49 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							ae16f33213 
							
						 
					 
					
						
						
							
							Fix a problem where usage server did not start because of a missing db.properties and log4j-cloud.xml  
						
						 
						
						
						
						
					 
					
						2013-04-15 15:02:47 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							265cf42ffe 
							
						 
					 
					
						
						
							
							packaging: sync master and 4.1 for rpm packaging  
						
						 
						
						
						
						
					 
					
						2013-04-05 21:18:16 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							1f206a4eb1 
							
						 
					 
					
						
						
							
							rpm: Install the LICENSE and NOTICE files  
						
						 
						
						
						
						
					 
					
						2013-04-05 18:49:44 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							171a967437 
							
						 
					 
					
						
						
							
							packaging: Three times is a charm  
						
						 
						
						... 
						
						
						
						Sorry about this, my packaging test system is out of order :-( 
						
						
					 
					
						2013-04-05 17:08:15 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							09f278f909 
							
						 
					 
					
						
						
							
							packaging: spark404 should test his commits  
						
						 
						
						
						
						
					 
					
						2013-04-05 16:42:42 +02:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Hugo Trippaers 
							
						 
					 
					
						
						
						
						
							
						
						
							89d3808a18 
							
						 
					 
					
						
						
							
							packaging: move jasypt jar to cloudstack-common  
						
						 
						
						... 
						
						
						
						Continuation of the work done in a35f7c7bd179a33e833d3d93f61f94ee7124c3f1 
						
						
					 
					
						2013-04-05 16:12:27 +02:00