Merged from trunk 6470:6473
authorFabian Groffen <grobian@gentoo.org>
Fri, 4 May 2007 19:21:08 +0000 (19:21 -0000)
committerFabian Groffen <grobian@gentoo.org>
Fri, 4 May 2007 19:21:08 +0000 (19:21 -0000)
commite83fc40bbb387d433a282cb4532c14d84721d58d
treef81f7180e2a2d761d443b6ac2e0223a3c81d6fc5
parentba72176df9f2273a139cb4d557ef6cd218bab677
   Merged from trunk 6470:6473

   +------------------------------------------------------------------------+
   | 6471     | document the behavior of `ebuild` wrt FEATURES=noauto       |
   | SpankMan | #175444                                                     |
   |----------+-------------------------------------------------------------|
   | 6472     | Remove news about profile masking which has been reverted   |
   | zmedico  | pending resolution of bug #170697. Thanks to Arfrever       |
   |          | Frehtes Taifersar Arahesis in #149508.                      |
   |----------+-------------------------------------------------------------|
   | 6473     | For bug #176765, when a new package is blocked by another   |
   | zmedico  | one that is being replaced, handle another case where the   |
   |          | conflict can be avoided.                                    |
   +------------------------------------------------------------------------+

svn path=/main/branches/prefix/; revision=6475
NEWS
man/ebuild.1
pym/emerge/__init__.py