commit 38b520ef673b9300c06773b70d19c528d415260d Merge: 7344a3a 143f670 Author: Petr Machata <pmachata at redhat.com> Date: Mon Jan 3 18:16:11 2011 +0100 Merge branch 'f14' Conflicts: boost.spec boost-random-dso.patch | 23 +++++++++++++++++++++++ boost.spec | 24 ++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 0 deletions(-) ---