[MERGE stable-2.1 into devel-2.1]

[Guido Trotter]

commit e67b9f07b4f01fad061996af21e86457c66dbc80
Merge: 3f1cf15 4d32feb
Author: Guido Trotter <ultrot...@google.com>
Date:   Fri Feb 26 15:15:25 2010 +0100

    Merge branch 'stable-2.1' into devel-2.1

    * stable-2.1:
      Add NLD constants to Ganeti
      Fix two potentially endless loops in http library
      Fix bug in LUQueryConfigValues
      Fix typo in LUVerifyCluster when checking node time