Merge remote-tracking branch 'martino/master' skytools_3_0_b0
authorMarko Kreen <markokr@gmail.com>
Tue, 15 Nov 2011 21:20:18 +0000 (23:20 +0200)
committerMarko Kreen <markokr@gmail.com>
Tue, 15 Nov 2011 21:20:18 +0000 (23:20 +0200)

Trivial merge