Merge branch 'master' of skype-git:/git/dba/skytools-3
authormartinko <gamato@users.sf.net>
Wed, 9 May 2012 14:18:59 +0000 (16:18 +0200)
committermartinko <gamato@users.sf.net>
Wed, 9 May 2012 14:18:59 +0000 (16:18 +0200)

Trivial merge