More work on bug 506360.
More work on bug 506360.

svn path=/trunk/; revision=3485

chrys87/orca-beep,pvagner/orca,GNOME/orca,h4ck3rm1k3/orca-sonar,h4ck3rm1k3/orca-sonar,pvagner/orca,chrys87/orca-beep,chrys87/orca-beep,pvagner/orca,GNOME/orca,chrys87/orca-beep,pvagner/orca,GNOME/orca,GNOME/orca,h4ck3rm1k3/orca-sonar