[jds-review] patch for bug 6646456

[Brian Lu]

Hi, all,

The patch is made based on the patch posted at 
http://bugs.freedesktop.org/show_bug.cgi?id=4945

Brian