Merge branch 'stable-2.6' into devel-2.6
authorMichael Hanselmann <hansmi@google.com>
Wed, 21 Nov 2012 03:52:29 +0000 (04:52 +0100)
committerMichael Hanselmann <hansmi@google.com>
Wed, 21 Nov 2012 05:51:10 +0000 (06:51 +0100)
commit6cbf6d9a228179582f3832bf24730c02c42322d6
tree059ac9b2d60705eb1d0d268e4a980727e590a11e
parent112b6e89946525b8ff7cac62abdc4bd2afb54f01
parent70296981564a7fe566a69b12c4111fcd30325674
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

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>