Comment 5 for bug 1056997

Hi Andes,

if you mean to merge the whole branch, not just this bugfix, hold on a second please.

I found 2 issues I introduced with my patches.
The 404 status in index.php is not as I intended and the module_is_included_in_page() needs a regexp now, because I noticed there a parameters possible.

working on that now...