Merge branch 'confd'
commit1ee3607bd833ef8e51c764392cb3ace13d536254
authorNedko Arnaudov <nedko@arnaudov.name>
Mon, 27 Sep 2010 21:21:13 +0000 (28 00:21 +0300)
committerNedko Arnaudov <nedko@arnaudov.name>
Mon, 27 Sep 2010 21:21:13 +0000 (28 00:21 +0300)
treea4a03ab6df05832e013e76a372a3991e2551b8a0
parent67ee4328812be7b86f0238ac31137f94a0b106d6
parent6c3ef670b65a9641b37e9df1a95b03336695960a
Merge branch 'confd'
daemon/virtualizer.c