[Merge] devel-2.4 → master

[Iustin Pop]

commit c9601b534181145ed2bd597e3b3a98d154da5a3f
Merge: 3500701 5abecc1
Author: Iustin Pop <ius...@google.com>
Date:   Thu Jul 28 13:10:28 2011 +0200

    Merge branch 'devel-2.4'
    
    * devel-2.4:
      Add support for cluster/OS parameters in QA
      Add OS search path to gnt-cluster info

(no conflicts)

-- 
iustin