Merge tag 'upstream/2.7'
authorDinko Korunic <kreator@carnet.hr>
Thu, 15 Aug 2013 17:33:08 +0000 (19:33 +0200)
committerDinko Korunic <kreator@carnet.hr>
Thu, 15 Aug 2013 17:33:08 +0000 (19:33 +0200)
Upstream version 2.7


Trivial merge