--- a/CHANGELOG.txt	Fri Dec 31 13:41:08 2010 +0100
+++ b/CHANGELOG.txt	Fri Dec 31 13:44:00 2010 +0100
@@ -1,11 +1,15 @@
+6.x--2-0-ALPHA6
+Bug Fixes
+ * Don't show the drupal_set_message in a popup, unless it is the bottom of the stack.
+
 6.x--2-0-ALPHA5
 Features
  * New options and options system.
  ** Added updateMethod, updateSource, onUpdate, doneTest, skipDirtyCheck, and hijackDestination.
  ** Removed noUpdate, reloadOnUpdate, forceReturn, nonModal and afterSubmit.
  ** Default options are declared in popups.js
- ** Options in on-popups-option attribute now override default and hook options, instead of replacing them. 
- * Popups.addedJS => Keeping track of JIT loaded JS files, so they are not reloaded. 
+ ** Options in on-popups-option attribute now override default and hook options, instead of replacing them.
+ * Popups.addedJS => Keeping track of JIT loaded JS files, so they are not reloaded.
 Bug Fixes
  * Fixed tests #7 & #8.
  * Fixing :input highlight in basic.css.
@@ -23,9 +27,9 @@
 Todo
  * Improve Popups.activeLayerIsEdited
  * Recapture the focus on popup if user tabs away.
- 
+
 6.x--2-0-ALPHA4
-Features  
+Features
  * Broadcast "Popups Open Path Done" event.
  * Huge change - Popup Stacking now works. Can have multiple Popups in the dom.
  ** Skins change most ids to classes.
@@ -38,7 +42,7 @@
 Bug Fixes
  * Removing the jit css files on popups close.
 Other
- * Removing additionalJavascript, additionalCSS and additionalJavascriptSettings. 
+ * Removing additionalJavascript, additionalCSS and additionalJavascriptSettings.
 
 6.x--2-0-ALPHA2
 New Features
@@ -49,7 +53,7 @@
  * Inline scripts need more testing:
  ** Should inline scripts be called before or after popup content is loaded?
  *** Poll wants to go after
- ** Should already loaded inlines be executed again? 
+ ** Should already loaded inlines be executed again?
 Todo
  * Can I control order of css adds (modules vs themes)?
  * What about multiple popups - can I flag the js files as already loaded?
@@ -76,7 +80,7 @@
  * http://drupal.org/node/373702 (Rob Loach) - Better wording for auto close messages.
  * Removing hook_theme and popup/save_dialog menu item.
  * http://drupal.org/node/385732 (Rob Loach) - Bugs fixes in refocus().
-Other 
+Other
  * Removed popups-popup.tpl.php - theming html now done in my_theme.js or in a skin.
 
 6.x--1-2