Merge commit 'origin/master'
authorØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 12 Oct 2009 07:28:56 +0000 (09:28 +0200)
committerØyvind Harboe <oyvind.harboe@zylin.com>
Mon, 12 Oct 2009 07:28:56 +0000 (09:28 +0200)

Trivial merge