Merge pull request #556 from Nigel62/master
authorMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 20 Apr 2012 23:32:35 +0000 (16:32 -0700)
committerMarc-André Moreau <marcandre.moreau@gmail.com>
Fri, 20 Apr 2012 23:32:35 +0000 (16:32 -0700)
Mods to fix issues #502 & #462


Trivial merge