Comment 2 for bug 616130

After looking at the the changes in r153[1] (the push I made the fix the merge problem), you can tell, the merge problem is in the same spot now and when I fixed it.

[1]http://bazaar.launchpad.net/~ubuntu-manual/ubuntu-manual/lucid-e2/revision/153#around-desktop/around-desktop.tex