Merge branch 'master' into kvm
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 1 Jul 2011 09:39:09 +0000 (11:39 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Fri, 1 Jul 2011 09:39:09 +0000 (11:39 +0200)
commita9583aa953ea25ee43ecb2979defc8e7aa9e96a9
treee997cd4d750b0d74270550f44b36ddd3115c7c74
parent42f0d074a71cddccbb55fcaa1c0e8e52e78312b5
parentb76e5cb134de5532abefdb8fabe701de0b44519c
Merge branch 'master' into kvm