Merge branch 'labels'
authorSergio Villar Senin <svillar@igalia.com>
Tue, 17 May 2011 18:33:42 +0000 (20:33 +0200)
committerSergio Villar Senin <svillar@igalia.com>
Tue, 17 May 2011 18:33:42 +0000 (20:33 +0200)
commit1c3327c4b4c0a02c7a3de68d5b185fd3623a5db6
treecc9ab2100e9855d6d4dba44713a0298bf6488383
parent5db0c6baab99ad063a8823e31bb18231bfe1e07b
parente0f7051001957ac2e3ab7f458d6399782edfac8b
Merge branch 'labels'