Merge branch 'refactor'
authorPaul Olav Tvete <paul.tvete@nokia.com>
Tue, 13 Sep 2011 11:03:01 +0000 (13:03 +0200)
committerPaul Olav Tvete <paul.tvete@nokia.com>
Tue, 13 Sep 2011 11:03:01 +0000 (13:03 +0200)

Trivial merge