Merge branch 'master' of git://github.com/markokr/skytools-dev
authorMartin Pihlak <martin.pihlak@gmail.com>
Fri, 6 Nov 2009 08:57:06 +0000 (10:57 +0200)
committerMartin Pihlak <martin.pihlak@gmail.com>
Fri, 6 Nov 2009 08:57:06 +0000 (10:57 +0200)

Trivial merge