tree 8b5d7721fc01c9f2000575a85045a2970d11a159
parent af331c74baa062f3ed2ab364aa5c589b0f58c5eb
author Tal Kammer <tkammer@redhat.com> 1370534943 +0300
committer Sean Dague <sdague@linux.vnet.ibm.com> 1370548463 -0400

Fixed last merge file from "tests" folder to new "api" folder

Also fixed the import to work with new directory structure

(updated to fix pep8 ordering issue)

Change-Id: I1403001268cdbbec2f4a395d062fee11bfc22e9c