Bug#594344: wrong version of patch applied

[Ben Armstrong <synrg@sanctuary.nslug.ns.ca>]

I just built a live image with the daily installer included and noticed 
it still has the bug.  When I checked the cdrom-detect.postinst, it is 
missing this additional line from my second patch:

-mount | grep -q 'on /cdrom' && exit 0
+mount | grep -q 'on /cdrom' && set_suite_and_codename && exit 0

So apparently my first version of the patch was inadvertently applied 
instead of the second.  Please fix this.

Thanks,
Ben