Merge commit 'refs/merge-requests/25' of git://gitorious.org/meego-developer-tools...
authorMarko Saukko <marko.saukko@cybercom.com>
Fri, 19 Aug 2011 05:59:26 +0000 (08:59 +0300)
committerMarko Saukko <marko.saukko@cybercom.com>
Fri, 19 Aug 2011 05:59:26 +0000 (08:59 +0300)
commitece8f84b84d02b7e5bc0898f0d60fb0adac14690
tree3818afa89c6f53f1c6fc4f8a0c9798442fbcc6cc
parent4f1e6dda44cf989da28b300875bc18362b6e6009
parentf868fba3c7bd462486aa41ea2461bfb802eafea9
Merge commit 'refs/merge-requests/25' of git://gitorious.org/meego-developer-tools/image-creator into merge-requests/25

Conflicts:
mic/imgcreate/__init__.py
tools/mic-image-creator

Fixed conflicts and changed if to elif.
mic/imgcreate/__init__.py
tools/mic-image-creator