--- includes/content.admin.inc.orig	2008-11-01 15:21:34.000000000 +0100
+++ includes/content.admin.inc	2008-11-03 05:09:53.000000000 +0100
@@ -568,6 +568,7 @@ function content_display_overview_form(&
   $label_options = array(
     'above' => t('Above'),
     'inline' => t('Inline'),
+    'inline-all' => t('Inline (all)'),
     'hidden' => t('<Hidden>'),
   );
   foreach ($fields as $name => $field) {
--- theme/content-field.tpl.php.orig	2008-08-27 17:11:24.000000000 +0200
+++ theme/content-field.tpl.php	2008-11-03 05:11:31.000000000 +0100
@@ -35,8 +35,8 @@
     foreach ($items as $delta => $item) :
       if (!$item['empty']) : ?>
         <div class="field-item <?php print ($count % 2 ? 'odd' : 'even') ?>">
-          <?php if ($label_display == 'inline') { ?>
-            <div class="field-label-inline<?php print($delta ? '' : '-first')?>">
+          <?php if (strpos($label_display, 'inline') !== FALSE) { ?>
+            <div class="field-label-inline<?php if ($label_display !== 'inline-all') print($delta ? '-hidden' : '-first')?>">
               <?php print t($label) ?>:&nbsp;</div>
           <?php } ?>
           <?php print $item['view'] ?>
--- theme/content-module.css.orig	2008-10-27 17:58:38.000000000 +0100
+++ theme/content-module.css	2008-11-03 05:11:31.000000000 +0100
@@ -7,10 +7,11 @@
   font-weight:bold;
 }
 .field .field-label-inline,
-.field .field-label-inline-first {
+.field .field-label-inline-first,
+.field .field-label-inline-hidden {
   display:inline;
 }
-.field .field-label-inline {
+.field .field-label-inline-hidden {
   visibility:hidden;
 }