svn merge -c1538333 ^/tiles/framework/branches/TILES_3_0_X . > Use the new tiles-master-6 > http://thread.gmane.org/gmane.comp.apache.tiles.devel/595