[boost: 2/2] Merge branch 'f14'

[Petr Machata]

commit 85e1b4dc59bef2cf179805696c51db2de290f141
Merge: 38b520e 5b821b0
Author: Petr Machata <pmachata at redhat.com>
Date:   Fri Jan 7 14:02:32 2011 +0100

    Merge branch 'f14'
    
    Conflicts:
    	boost.spec

 boost.spec |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)
---