The end of the desktop war?

Jono Bacon writes “Has the desktop war ended? Here I ramble about whether the KDE and GNOME camps have reached basically the same point.”