Merged from trunk -r12420:12422
authorFabian Groffen <grobian@gentoo.org>
Sun, 11 Jan 2009 14:31:40 +0000 (14:31 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sun, 11 Jan 2009 14:31:40 +0000 (14:31 -0000)
commit497b10604ea665e0efc9891bfea0f3bc38902505
treead51667a070959cf41002b3866dab057f1b2fd54
parent125998c12654b1348af1ef9feac194ba63c36084
   Merged from trunk -r12420:12422

   | 12421   | When displaying parents of unsolved blockers, prefer parents |
   | zmedico | that are not directly involved in a conflict.                |

   | 12422   | If necessary, use /proc/loadavg to emulate os.getloadavg().  |
   | zmedico |                                                              |

svn path=/main/branches/prefix/; revision=12425
pym/_emerge/__init__.py