Merge branch 'xsync-transition-bug-59644' into for-keith
authorPeter Hutterer <peter.hutterer@who-t.net>
Fri, 18 Oct 2013 06:50:12 +0000 (16:50 +1000)
committerPeter Hutterer <peter.hutterer@who-t.net>
Fri, 18 Oct 2013 06:50:12 +0000 (16:50 +1000)

Trivial merge