[MERGE] stable-2.6 into devel-2.6

[Michael Hanselmann]

commit f99f151 (HEAD, devel-2.6)
Merge: 112b6e8 7029698
Author: Michael Hanselmann <han...@google.com>
Date:   Wed Nov 21 04:52:29 2012 +0100

    Merge branch 'stable-2.6' into devel-2.6
    
    * stable-2.6:
      Fix opcode validation for OpOobCommand.command
      Fix typo in manpage for gnt-os
      gnt-instance.8: Add index to disk and nic removal