Merge branch 'master' into kvm
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 16 Mar 2012 15:11:08 +0000 (16:11 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 16 Mar 2012 15:11:08 +0000 (16:11 +0100)
commit4fe3a80880d73567b06a3a9dc9bc15f1051e2527
tree70dfa4f9795689653e1155939198b82a7a2c0fad
parent367bcc9ed666df40a8a7e754e0e7e43dc756d9b5
parentc7d16ba52fbd56815f181ca3853f304dae18be8b
Merge branch 'master' into kvm
setup.py