Merge branch 'master' of skype-git:/git/dba/skytools-3
authormartinko <gamato@users.sf.net>
Fri, 11 May 2012 06:30:33 +0000 (08:30 +0200)
committermartinko <gamato@users.sf.net>
Fri, 11 May 2012 06:30:33 +0000 (08:30 +0200)

Trivial merge