Merge branch 'master' of skype-git:/git/dba/skytools-3
authormartinko <gamato@users.sf.net>
Tue, 8 Jan 2013 16:20:13 +0000 (17:20 +0100)
committermartinko <gamato@users.sf.net>
Tue, 8 Jan 2013 16:20:13 +0000 (17:20 +0100)

Trivial merge