diff -urp ../dp_installed_files/activitystream_orig/activitystream.module sites/all/modules/activitystream/activitystream.module
--- ../dp_installed_files/activitystream_orig/activitystream.module	2008-05-20 17:35:54.000000000 -0500
+++ sites/all/modules/activitystream/activitystream.module	2008-07-27 23:12:19.000000000 -0500
@@ -223,12 +223,13 @@ function activitystream_view($node, $tea
   return $node;
 }
 
-function activitystream_get_activity($user = null, $show_buddies = false, $count = 15) {
+function activitystream_get_activity($user = null, $show_buddies = false, $count = NULL) {
 	$items = _activitystream_get_activity($user, $show_buddies, $count);
 	return theme('activitystream',$items);
 }
 
-function _activitystream_get_activity($user = null, $show_buddies = false, $count = 15) {
+function _activitystream_get_activity($user = null, $show_buddies = false, $count = NULL) {
+  $count = ($count) ? $count : variable_get('activitystream_items_per_page', 15);
 	if (module_exists('buddylist') && $show_buddies) {
 		$buddies = db_query('SELECT bl.buddy as bid FROM {buddylist} bl WHERE bl.uid = %d',$user->uid);
 		// Since a number of items might be from the same buddy, load the users now and stuff them
@@ -326,14 +327,23 @@ function activitystream_cron() {
  * Implementation of hook_settings()
  */
 function activitystream_settings() {
-	
-  $form['activitystream_title'] = array(
+	$form['activitystream'] = array(
+	  '#type' => 'fieldset',
+	  '#title' => t('General Settings'),
+	  '#weight' => -1,
+	);
+  $form['activitystream']['activitystream_title'] = array(
     '#type' => 'textfield',
     '#title' => t('Title'),
     '#default_value' => variable_get('activitystream_title', 'Activity Stream'),
     '#description' => t('The title of the Activiy Stream in blocks and User Profiles.')
   );
-  
+  $form['activitystream']['activitystream_items_per_page'] = array(
+    '#type' => 'textfield',
+    '#title' => t('Items per page'),
+    '#default_value' => variable_get('activitystream_items_per_page', 15),
+    '#description' => t('Number of items to display per page on the global stream page, and each user\'s profile'),
+  );
   return system_settings_form($form);
 }