Fix conflicts in last commit

Aleksander Machniak

2013-07-04 c3fe8a0b7a04bb0b27d69f60bb893264f77b30e0

1
2
3
4
5
6
.panel_wrapper {height:85px;} 
.panel_wrapper div.current {height:85px;} 
 
/* IE */ 
* html .panel_wrapper {height:100px;} 
* html .panel_wrapper div.current {height:100px;}