Merge branch 'master' into kvm
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 22 Aug 2011 05:16:41 +0000 (07:16 +0200)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Mon, 22 Aug 2011 05:16:41 +0000 (07:16 +0200)
commit8c7e5058c9ebf13de1385a306f3c1d9ed40aecac
treea38fc64484422972096cdf879e0e817deb5b2cb4
parent223f52df8f5be28be4ae5ab5ed7d413e88d052ec
parentaa0a88f3a9c7db57b123bc133c7f9a5be2da4a51
Merge branch 'master' into kvm