Merge commit 'origin/master'
authorØyvind Harboe <oyvind.harboe@zylin.com>
Fri, 9 Oct 2009 07:14:27 +0000 (09:14 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Fri, 9 Oct 2009 07:14:27 +0000 (09:14 +0200)

Trivial merge