Merge pull request #3 from bartosh/master

author JF Ding <jfding@gmail.com>

Fri, 16 Dec 2011 03:37:43 +0000 (19:37 -0800)

committer JF Ding <jfding@gmail.com>

Fri, 16 Dec 2011 03:37:43 +0000 (19:37 -0800)
author JF Ding <jfding@gmail.com>
Fri, 16 Dec 2011 03:37:43 +0000 (19:37 -0800)
committer JF Ding <jfding@gmail.com>
Fri, 16 Dec 2011 03:37:43 +0000 (19:37 -0800)
diff --cc README.rst
Simple merge
diff --cc mic/imager/baseimager.py
Simple merge
diff --cc plugins/backend/zypppkgmgr.py
Simple merge
author	JF Ding <jfding@gmail.com>
	Fri, 16 Dec 2011 03:37:43 +0000 (19:37 -0800)
committer	JF Ding <jfding@gmail.com>
	Fri, 16 Dec 2011 03:37:43 +0000 (19:37 -0800)
		1	2
README.rst	patch \|	diff1 \|	diff2 \|	blob \| history
mic/imager/baseimager.py	patch \|	diff1 \|	diff2 \|	blob \| history
plugins/backend/zypppkgmgr.py	patch \|	diff1 \|	diff2 \|	blob \| history