[MERGE] devel-2.7 into master

[Michael Hanselmann]

commit 77e3052 (HEAD, master)
Merge: 9842f02 cd04dfd
Author: Michael Hanselmann <han...@google.com>
Date:   Thu Jan 24 11:46:48 2013 +0100

    Merge branch 'devel-2.7'
    
    * devel-2.7:
      hv_*: Always return from Verify, style fixes
      _VerifyErrors()._Error() and _ErrorIf() are now consistent
      Handle the result of QueryGroups() correctly
    
    Signed-off-by: Michael Hanselmann <han...@google.com>