From: Guido Trotter <ultrotter@google.com>
Date: Wed, 20 May 2009 13:13:56 +0000 (+0100)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.0.1~6^2~7
X-Git-Url: https://code.grnet.gr/git/ganeti-local/commitdiff_plain/f226f085f535dbfe4d702c5dedc446ebceddb1b0

Merge branch 'master' into next

Signed-off-by: Guido Trotter <ultrotter@google.com>
---

f226f085f535dbfe4d702c5dedc446ebceddb1b0