Merge commit 'refs/merge-requests/152' of git://gitorious.org/rekonq/mainline
authorAndrea Diamantini <adjam7@gmail.com>
Wed, 21 Jul 2010 22:33:33 +0000 (00:33 +0200)
committerAndrea Diamantini <adjam7@gmail.com>
Wed, 21 Jul 2010 22:33:33 +0000 (00:33 +0200)
commitc0e3429667be51ce423feb787d3c00dc5c9c1163
tree98d7c03c737e5f55ad351863566880daa02dafe6
parent7209ddcd11d448b3a1d9507c06979ff4b78df0f9
parent619f89bff1ba082ffdc07e93a059d075494a7920
Merge commit 'refs/merge-requests/152' of git://gitorious.org/rekonq/mainline