[holland/f13/master: 2/2] Merge branch 'HEAD', remote branch 'origin/master' into f13

[derks]

commit b5580094cef24bc31aa00a1feadb112c1b2ae9e2
Merge: 81000df b635ccb
Author: BJ Dierkes <wdierkes at 5dollarwhitebox.org>
Date:   Thu Jan 13 17:30:23 2011 -0600

    Merge branch 'HEAD', remote branch 'origin/master' into f13

 holland.spec |   15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)
---