Merge remote branch 'devel-2.4'
authorRené Nussbaumer <rn@google.com>
Wed, 23 Feb 2011 13:29:00 +0000 (14:29 +0100)
committerRené Nussbaumer <rn@google.com>
Wed, 23 Feb 2011 13:31:29 +0000 (14:31 +0100)
commit502b331652955c23c3823321312b75f76db322d2
treed07b8ff6df82b363184e8fe442484769e9b6f9e5
parent4cc4d1faae9424367e9f98287eb26160f234790c
parentbacae5368b5c19d899d7e8f28f287e6b206f7d70
Merge remote branch 'devel-2.4'

Signed-off-by: René Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
test/ganeti.query_unittest.py