Merge branch 'kinetic'
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 21 Jun 2010 07:19:23 +0000 (10:19 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 21 Jun 2010 07:19:23 +0000 (10:19 +0300)

Trivial merge