Merge branch 'master' into gtk
authorArun Persaud <arun@nubati.net>
Mon, 18 Jan 2010 01:47:19 +0000 (17:47 -0800)
committerArun Persaud <arun@nubati.net>
Mon, 18 Jan 2010 01:47:19 +0000 (17:47 -0800)
commitd3a2e284a0e5e7e0d8b6680d51d53cbee3930169
tree24efc198476d3165c8565e34161fc2242091f99e
parent344885687fdf87558b7932280545f5f4ea78771c
parent6a7ecf0e9c090c22214673eea2def829dd052315
Merge branch 'master' into gtk

Conflicts:
backend.c
backend.c