Merge branch 'master' into shakti/test
authorTuomas Jormola <tj@solitudo.net>
Wed, 21 Nov 2012 23:09:02 +0000 (01:09 +0200)
committerTuomas Jormola <tj@solitudo.net>
Wed, 21 Nov 2012 23:09:02 +0000 (01:09 +0200)

Trivial merge