Hopefully legacy type images will work now.  Had to check if d1.original.partitions exists, if so use the proper methods, otherwise use the old methods.

git-svn-id: https://svn.code.sf.net/p/freeghost/code/trunk@2455 71f96598-fa45-0410-b640-bcd6f8691b32
Merge svn with master