Merged from trunk -r14176:14182
authorFabian Groffen <grobian@gentoo.org>
Fri, 4 Sep 2009 19:20:24 +0000 (19:20 -0000)
committerFabian Groffen <grobian@gentoo.org>
Fri, 4 Sep 2009 19:20:24 +0000 (19:20 -0000)
commita7855a29eab576947ac964c4c3574566f5794b99
tree095b5f71fd73e2eac7fcebb5e295b3ed8824e6fb
parentf1cf32d2355c7b39d067053eed282a2e8ebf63a4
   Merged from trunk -r14176:14182

   | 14180   | Use _unicode_decode() on the string retunred from            |
   | zmedico | time.strftime(), in order to avoid a potential               |
   |         | UnicodeDecodeError later. Thanks to Markus Duft              |
   |         | <mduft@gentoo.org> for reporting.                            |

   | 14181   | Bug #283513 - Do not allow --noreplace together with         |
   | zmedico | --emptytree since it results in bogus masking messages.      |

   | 14182   | Fix typo from previous commit.                               |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=14183
pym/_emerge/main.py
pym/portage/elog/mod_save_summary.py