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)
commit4d6bdbddd489e4935184ffae6365ea64c7f7e481
tree32ff3e9ebba123ebff98a2ec808ac675ce91c3d3
parent11833daa4a3a6f0f3dc330b6acfebf81bab7df8e
parent5a0898e15124f0f1c10e369824fc54f0f623be9d
Merge branch 'indicator'