Merge commit 'v4.4.0' into gtk
authorArun Persaud <arun@nubati.net>
Sat, 3 Oct 2009 17:44:35 +0000 (10:44 -0700)
committerArun Persaud <arun@nubati.net>
Sat, 3 Oct 2009 17:44:35 +0000 (10:44 -0700)
Conflicts:
configure.ac

1  2 
backend.c

diff --cc backend.c
Simple merge