Merge branch 'gaia'
authorJulien Valroff <julien@kirya.net>
Tue, 18 Oct 2011 16:58:00 +0000 (18:58 +0200)
committerJulien Valroff <julien@kirya.net>
Tue, 18 Oct 2011 16:58:00 +0000 (18:58 +0200)
commitea78ff8461b90b8eba31e680d7d67d1ca8ee862f
treec4cdbb0d17757c243d9c839dba04c2270579ec34
parent55264081560b0d38a876ce2e73006c95f5dbbfb4
parentd2ccc60514006eb5ef05412ff60c84076f929c4b
Merge branch 'gaia'

Conflicts:
autostart
autostart