Merge branch 'indicator'
authorKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 27 Jul 2010 09:41:01 +0000 (12:41 +0300)
committerKatri Kaikkonen <katri.kaikkonen@ixonos.com>
Tue, 27 Jul 2010 09:41:01 +0000 (12:41 +0300)

Trivial merge