Merge branch 'master' into kvm
authorCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 24 Nov 2011 12:42:43 +0000 (13:42 +0100)
committerCédric de Saint Martin <cedric.dsm@tiolive.com>
Thu, 24 Nov 2011 12:42:43 +0000 (13:42 +0100)
commit28ddc184e0126966762a9f11f598e487b2cb4242
tree9db08ab19ca4eeb9ad6a7281f04166fe0bfb7339
parente191441c6e260fd55c7d19cba9292170c63a5495
parentd6d5bdde26dbf1f9ab4e262431efbe47c5b6aa34
Merge branch 'master' into kvm