Merge branch 'master' into situare_interact
authorJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 8 Sep 2010 12:09:49 +0000 (15:09 +0300)
committerJussi Laitinen <jupe@l3l7588.ixonos.local>
Wed, 8 Sep 2010 12:09:49 +0000 (15:09 +0300)

Trivial merge