Merge commit 'nodemanager-1.8-28' into 1.8
authorBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Tue, 27 Jul 2010 12:58:22 +0000 (14:58 +0200)
committerBarış Metin <Talip-Baris.Metin@sophia.inria.fr>
Tue, 27 Jul 2010 12:58:22 +0000 (14:58 +0200)

Trivial merge