Bug#1081879: Merging bugs, they are caused by the same problem

[Margarita Manterola]

merge 1092391 1081879
thanks

These two bugs are caused by the same issue. When rustdoc is trying to 
test the code based on the doctests, it fails to find the source code.

--
Regards,
Marga