Merge commit 'refs/merge-requests/2295' of git://gitorious.org/rekonq/mainline
authorAndrea Diamantini <adjam7@gmail.com>
Wed, 15 Sep 2010 22:51:50 +0000 (00:51 +0200)
committerAndrea Diamantini <adjam7@gmail.com>
Wed, 15 Sep 2010 22:51:50 +0000 (00:51 +0200)
commitb33af30051796d6e150bc632da102124d9939ea7
tree4a5c8ed6479ebe79884c3a2da33a8ec201fc0aa5
parent56c8c25d6a5be302e99de869ea52b1fad763998d
parent653457c61fb27887bfb37eab656181b958db886e
Merge commit 'refs/merge-requests/2295' of git://gitorious.org/rekonq/mainline