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)
commitf32deb5b692be9f7f27b4d51bd5351b5def8477c
treeb6de6dc9d9382fee99d389f49c132998237c6a11
parent544641fa2917de457a12cd234001477df62c588a
parentce4c055b222a4913193e28809c2945cd16bedf15
Merge branch 'master' into debian_packaging