[PUSHED] Partial fix for Bug 30711

[Miklos Vajna]

Hi Brennan,

On Sun, Apr 08, 2012 at 02:47:28PM -0700, Brennan T Vincent <brennanv at email.arizona.edu> wrote:
> I have modified the patch somewhat; please take a look at this new version.

Pushed, thanks for this.

Please mention in the bug as a comment what is the area that still needs
some love (or in case the "partial" is just a leftover from the subject,
then close the bug).

Miklos