[synfig/f17: 2/2] Merge branch 'master' into f17

[Jon Ciesla]

commit 2ba2c733de11a4c687964f06899ae89ff6936c49
Merge: 45fe39b 0030a68
Author: Jon Ciesla <limburgher at gmail.com>
Date:   Thu Mar 22 08:10:23 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	synfig.spec

 synfig-0.62.00-canvas.patch |   26 --------------------------
 synfig.spec                 |    6 ++----
 2 files changed, 2 insertions(+), 30 deletions(-)
---