Merge branch 'rr1-maint'

This commit is contained in:
Ilari Liusvaara 2013-01-18 21:15:13 +02:00
commit 17ff101f9d