Merge commit 'origin'
authorJohan Dahlin <johan@gnome.org>
Mon, 6 Jul 2009 14:05:11 +0000 (11:05 -0300)
committerJohan Dahlin <johan@gnome.org>
Mon, 6 Jul 2009 14:05:11 +0000 (11:05 -0300)
commit62b1395a3650f4445dc28ec8f4ff82f0e7cbddd1
treea9de890262fb0654ccf0a8046bb68964228b9f28
parent4fabb3e649b9d359e10454bdf3984a3bdf5bb285
parent11af62358ce600cecceb7af858074281901d5067
Merge commit 'origin'