Merge commit 'refs/merge-requests/153' of git://gitorious.org/rekonq/mainline into...
authorAndrea Diamantini <adjam7@gmail.com>
Wed, 21 Jul 2010 23:00:40 +0000 (01:00 +0200)
committerAndrea Diamantini <adjam7@gmail.com>
Wed, 21 Jul 2010 23:00:40 +0000 (01:00 +0200)
commitbbab050a3b1c6a631aed8fdf5b0ab484378e0cef
tree10798d78258216ebdfabc8ba6c04b8034dc9dd4e
parentc0e3429667be51ce423feb787d3c00dc5c9c1163
parent82c52bd0097bb71d3594d32f18617ad5c7466d6d
Merge commit 'refs/merge-requests/153' of git://gitorious.org/rekonq/mainline into m153

Conflicts:
src/history/historymanager.cpp
src/history/historymanager.h
src/history/historymanager.cpp
src/history/historymanager.h