Merge branch 'master' of git://anongit.freedesktop.org/wayland
authorCallum Lowcay <callum@callumscode.com>
Wed, 12 Jan 2011 06:40:14 +0000 (19:40 +1300)
committerCallum Lowcay <callum@callumscode.com>
Wed, 12 Jan 2011 06:40:14 +0000 (19:40 +1300)
commit9acdb50084ecdba57017ddf818e8a79f6328af13
treeec63f39310a7d1bb4f936f4df53f466708c068ce
parent67a201da6f11916463e97d01a53ae8df0cd29627
parent08c40c3550daa17738b78c3922fa94609638b13a
Merge branch 'master' of git://anongit.freedesktop.org/wayland

Conflicts:
clients/terminal.c
clients/terminal.c