Merge from Temp_Floats branch: Fixed a bug with indent handling when margins are used on a surrounding block and not start/end-indent.
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/properties/IndentPropertyMaker.java