[MERGE] devel-2.4 into master

[Michael Hanselmann]

commit f0258c2819dbd681f0dc2e5575b09bb009955ec8
Merge: f2c6673 f5182ec
Author: Michael Hanselmann <han...@google.com>
Date:   Wed Feb 23 13:25:09 2011 +0100

    Merge branch 'devel-2.4'
    
    * devel-2.4:
      Fix title of query field containing instance name