Merge branch 'queue-17'

Created by  Rob Vermaas  on April 13, 2010
OV7F5M3EQBESXVE3GGPXCTEBF2KZH6CUM6ZTXEF72HDSKRLUIZRAC
Change contents