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)
commit026559068d889660ad4545ee28b6561c82c39aea
tree7e318d1698b5eac365bc512a9d0027cc70b4d11e
parentc8d935ab7cbffb8b72e52bc39bfe85bb97dce0ac
parent2d924a59db74f12d210e26abfab629cbcfbfc014
Merge commit 'origin/master'