merge from master
commita9fd70b45d8fd27ccf9339258b4958da41a5c10e
authorRob Savoye <rob@welcomehome.org>
Mon, 2 May 2011 13:32:55 +0000 (2 07:32 -0600)
committerRob Savoye <rob@welcomehome.org>
Mon, 2 May 2011 13:32:55 +0000 (2 07:32 -0600)
tree0cf85d0dfb0bc7306bad3063cd7b3e128dc67d3d
parent4286c181de27daa732055e01e4b56c0028c1ebdf
merge from master
gui/gtk/gtk_canvas.cpp