Merge remote branch 'phako/integration'
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Sat, 28 Aug 2010 01:40:20 +0000 (04:40 +0300)
committerZeeshan Ali (Khattak) <zeeshanak@gnome.org>
Sat, 28 Aug 2010 01:40:20 +0000 (04:40 +0300)

Trivial merge