Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

app/views/layouts/default.rhtml

@@ -22,7 +22,7 @@
     }
     <%= File.read(RAILS_ROOT + '/public/stylesheets/instiki.css') if @inline_style %>
   </style>
-  <%= stylesheet_link_tag 'instiki' unless @inline_style %>
+  <%= stylesheet_link_tag 'instiki', :media => 'all'  unless @inline_style %>
   <%= "<style type='text/css'>#{@style_additions}</style>" if @style_additions %>
   <style type="text/css"><!--/*--><![CDATA[/*><!--*/    
     <%= @web ? @web.additional_style : '' %>

app/views/wiki/print.rhtml

@@ -2,7 +2,6 @@
   @title = @page.plain_name
   @hide_navigation = true
   @style_additions = ".newWikiWord { background-color: white; font-style: italic; }"
-  @inline_style = true
 -%>
 
 <%= @renderer.display_content_for_export %>