Merge remote-tracking branch 'origin/YaSp' into richelieu-vmkit
Peter Senna Tschudin [Fri, 3 May 2013 15:02:57 +0000 (17:02 +0200)]

Trivial merge