Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

This commit is contained in:
Joanna Rutkowska 2011-11-09 13:07:45 +01:00
commit 635219767b

View File

@ -22,7 +22,7 @@
from qubes.qubes import QubesVmCollection
from qubes.qubesutils import block_list,block_attach,block_detach,block_check_attached
from qubes.qubesutils import kbytes_to_kmg
from qubes.qubesutils import kbytes_to_kmg, bytes_to_kmg
from optparse import OptionParser
import subprocess
import sys