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)
commitf9ab6e249c7cefa77cd96ac398171544efc77bc3
tree442521639264bd6780d90c201204fff3346f227b
parentf9bc56bb8c81aef32c2bc9deb87ea360471e77c6
parent5628ef8f07e4048c7a3bfd396f6e95761b468051
Merge remote branch 'phako/integration'