Merge branch 'fix_qemu_size_argument' of https://github.com/berendt/packer...

Merge branch 'fix_qemu_size_argument' of https://github.com/berendt/packer into berendt-fix_qemu_size_argument

Conflicts:
	website/source/docs/builders/qemu.html.markdown

website/source/docs/builders/qemu.html.markdown

@@ -186,7 +186,7 @@ qemu-system-x86 command. The arguments are all printed for review.
 ```javascript
   // ...
   "qemuargs": [
-    [ "-m", "1024m" ],
+    [ "-m", "1024M" ],
     [ "--no-acpi", "" ],
     [
        "-netdev",
@@ -201,9 +201,9 @@ qemu-system-x86 command. The arguments are all printed for review.
 
   would produce the following (not including other defaults supplied by the builder and not otherwise conflicting with the qemuargs):
 
-```text
-qemu-system-x86 -m 1024m --no-acpi -netdev user,id=mynet0,hostfwd=hostip:hostport-guestip:guestport -device virtio-net,netdev=mynet0"
-```
+<pre class="prettyprint">
+	qemu-system-x86 -m 1024m --no-acpi -netdev user,id=mynet0,hostfwd=hostip:hostport-guestip:guestport -device virtio-net,netdev=mynet0"
+</pre>
 
 * `qemu_binary` (string) - The name of the Qemu binary to look for.  This
   defaults to "qemu-system-x86_64", but may need to be changed for some