Merge branch 'small_fix'
authorlampehe-local <henri.lampela@ixonos.com>
Wed, 23 Jun 2010 10:58:59 +0000 (13:58 +0300)
committerlampehe-local <henri.lampela@ixonos.com>
Wed, 23 Jun 2010 10:58:59 +0000 (13:58 +0300)

Trivial merge