diff -Nru brightbox-cli-0.18.0/debian/bzr-builder.manifest brightbox-cli-0.18.1/debian/bzr-builder.manifest
--- brightbox-cli-0.18.0/debian/bzr-builder.manifest	2012-04-18 10:00:26.000000000 +0000
+++ brightbox-cli-0.18.1/debian/bzr-builder.manifest	2012-06-20 10:11:20.000000000 +0000
@@ -1,2 +1,2 @@
-# bzr-builder format 0.3 deb-version {debupstream}-0ubuntu1~244
-lp:~brightbox/brightbox/brightbox-cli-packaged revid:git-v1:dfed6be8c0dcd16ce815289e159f44e8d377ff5a
+# bzr-builder format 0.3 deb-version {debupstream}-0ubuntu1~246
+lp:~brightbox/brightbox/brightbox-cli-packaged revid:git-v1:a0346ec20860b60ef6e6287e967a9484bcdf0e75
diff -Nru brightbox-cli-0.18.0/debian/changelog brightbox-cli-0.18.1/debian/changelog
--- brightbox-cli-0.18.0/debian/changelog	2012-04-18 10:00:26.000000000 +0000
+++ brightbox-cli-0.18.1/debian/changelog	2012-06-20 10:11:20.000000000 +0000
@@ -1,8 +1,14 @@
-brightbox-cli (0.18.0-0ubuntu1~244~oneiric1) oneiric; urgency=low
+brightbox-cli (0.18.1-0ubuntu1~246~oneiric1) oneiric; urgency=low
 
   * Auto build.
 
- -- Neil Wilson <neil@aldur.co.uk>  Wed, 18 Apr 2012 10:00:26 +0000
+ -- Neil Wilson <neil@aldur.co.uk>  Wed, 20 Jun 2012 10:11:20 +0000
+
+brightbox-cli (0.18.1-0ubuntu1) quantal; urgency=low
+
+  * New upstream release 
+
+ -- Neil Wilson <neil@aldur.co.uk>  Wed, 20 Jun 2012 10:38:05 +0100
 
 brightbox-cli (0.18.0-0ubuntu1) precise; urgency=low
 
diff -Nru brightbox-cli-0.18.0/lib/brightbox-cli/images.rb brightbox-cli-0.18.1/lib/brightbox-cli/images.rb
--- brightbox-cli-0.18.0/lib/brightbox-cli/images.rb	2012-04-18 10:00:24.000000000 +0000
+++ brightbox-cli-0.18.1/lib/brightbox-cli/images.rb	2012-06-20 10:11:17.000000000 +0000
@@ -39,14 +39,14 @@
         end
       end
 
-      snapshots = images.select { |i| i.source_type == 'snapshot' }
-      images = images - snapshots
-
       unless options[:a]
         account = Account.conn_account
         images.reject! { |i| !i.official and i.owner_id != account.id  }
       end
 
+      snapshots = images.select { |i| i.source_type == 'snapshot' }
+      images = images - snapshots
+
       images.sort! { |a, b| a.default_sort_fields <=> b.default_sort_fields }
       snapshots.sort! { |a, b| a.created_at <=> b.created_at }
       images + snapshots
diff -Nru brightbox-cli-0.18.0/lib/brightbox-cli/version.rb brightbox-cli-0.18.1/lib/brightbox-cli/version.rb
--- brightbox-cli-0.18.0/lib/brightbox-cli/version.rb	2012-04-18 10:00:24.000000000 +0000
+++ brightbox-cli-0.18.1/lib/brightbox-cli/version.rb	2012-06-20 10:11:17.000000000 +0000
@@ -1,3 +1,3 @@
 module Brightbox
-  VERSION = "0.18.0" unless defined?(Brightbox::VERSION)
+  VERSION = "0.18.1" unless defined?(Brightbox::VERSION)
 end