Merge commit 'refs/merge-requests/150' of git://gitorious.org/rekonq/mainline
authorAndrea Diamantini <adjam7@gmail.com>
Wed, 21 Jul 2010 22:32:09 +0000 (00:32 +0200)
committerAndrea Diamantini <adjam7@gmail.com>
Wed, 21 Jul 2010 22:32:09 +0000 (00:32 +0200)
commit7209ddcd11d448b3a1d9507c06979ff4b78df0f9
tree0ef59bdf0524df2c8b5147c19ea0b9a37bb5ec22
parent182bc4aedf8186ddd6a87c8b457d770ce0b904d8
parent3ad0cbadf61dcce5fde72d4a30c5db7da345acb0
Merge commit 'refs/merge-requests/150' of git://gitorious.org/rekonq/mainline