[libbluedevil/f14/master: 3/3] Merge remote branch 'origin/master' into f14/master

[Rex Dieter]

commit 8f6db6cf33c6d517ca6b1dceca9331bc31ae8563
Merge: fce97b4 a907ac5
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 14 10:13:48 2011 -0600

    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	libbluedevil.spec

 .gitignore        |    1 +
 libbluedevil.spec |   12 ++++++++----
 sources           |    2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
---