[libvirt] [PATCH for 1.3.3 0/6] Fix a mis-merge

[John Ferlan]

Details in each patch... 

Depending on whether I get a review before I close my eyes for the
night I can push or if reviewed after than and before a release is
made - I'm sure someone else can grab and push too...

John Ferlan (6):
  qemu: Fix mis-merge of qemuBuildSmartcardCommandLine
  qemu: Fix mis-merge of qemuBuildSerialCommandLine
  qemu: Fix mis-merge of qemuBuildParallelsCommandLine
  qemu: Fix mis-merge of qemuBuildChannelsCommandLine
  qemu: Fix mis-merge of qemuBuildConsoleCommandLine
  qemu: Fix mis-merge of qemuBuildRedirdevCommandLine

 src/qemu/qemu_command.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

-- 
2.5.5