Merge branch 'master' of https://github.com/markokr/skytools
authorEgon Valdmees <egon.valdmees@skype.net>
Wed, 1 Jun 2011 06:38:34 +0000 (06:38 +0000)
committerEgon Valdmees <egon.valdmees@skype.net>
Wed, 1 Jun 2011 06:38:34 +0000 (06:38 +0000)

Trivial merge