Merge branch 'master' into debian_packaging
authorKaj Wallin <kaj.wallin@ixonos.com>
Wed, 12 May 2010 09:26:15 +0000 (12:26 +0300)
committerKaj Wallin <kaj.wallin@ixonos.com>
Wed, 12 May 2010 09:26:15 +0000 (12:26 +0300)

Trivial merge