Merged from trunk -r15178:15180
authorFabian Groffen <grobian@gentoo.org>
Sat, 9 Jan 2010 15:05:08 +0000 (15:05 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sat, 9 Jan 2010 15:05:08 +0000 (15:05 -0000)
commit28a4e0d37c1d66f5e5207b4bfc19ea75cc42f9c2
tree23d40bb7f55233e60d8d7ae3e13cb29d52a5ffc1
parenteb86b1a4cdac0528c2fb7ab5e9cfd20589e6d0a1
   Merged from trunk -r15178:15180

   | 15179   | Skip global updates for help, version, and info actions.     |
   | zmedico |                                                              |

   | 15180   | Fix blocker example output to appear as emerge actually      |
   | zmedico | displays it.                                                 |

svn path=/main/branches/prefix/; revision=15181
man/emerge.1
pym/_emerge/main.py